[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[245] mplayerxp

[<nic...@us...>]

Revision: 245
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=245&view=rev
Author:   nickols_k
Date:     2012-10-29 12:34:45 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
move fastmemcpy into osdep

Modified Paths:
--------------
    mplayerxp/libao2/ao_sdl.c
    mplayerxp/libmpcodecs/ad_mp3.c
    mplayerxp/libmpcodecs/dec_audio.c
    mplayerxp/libmpcodecs/vd_xanim.c
    mplayerxp/libmpdemux/cache2.c
    mplayerxp/libmpdemux/demux_bmp.c
    mplayerxp/libmpdemux/demuxer.c
    mplayerxp/libmpdemux/s_tv.c
    mplayerxp/libmpdemux/stream.c
    mplayerxp/libvo/Makefile
    mplayerxp/libvo/video_out.c
    mplayerxp/libvo/vo_dga.c
    mplayerxp/libvo/vo_fbdev.c
    mplayerxp/libvo/vo_opengl.c
    mplayerxp/libvo/vo_sdl.c
    mplayerxp/libvo/vo_vesa.c
    mplayerxp/libvo/vo_x11.c
    mplayerxp/libvo/vo_xv.c
    mplayerxp/libvo/vosub_vidix.c
    mplayerxp/mp_image.c
    mplayerxp/osdep/Makefile
    mplayerxp/postproc/af_export.c
    mplayerxp/postproc/af_ffenc.c
    mplayerxp/postproc/af_scaletempo.c
    mplayerxp/postproc/vf.c
    mplayerxp/postproc/vf_delogo.c
    mplayerxp/postproc/vf_denoise3d.c
    mplayerxp/postproc/vf_dint.c
    mplayerxp/postproc/vf_down3dright.c
    mplayerxp/postproc/vf_expand.c
    mplayerxp/postproc/vf_il.c
    mplayerxp/postproc/vf_menu.c
    mplayerxp/postproc/vf_mirror.c
    mplayerxp/postproc/vf_noise.c
    mplayerxp/postproc/vf_panscan.c
    mplayerxp/postproc/vf_perspective.c
    mplayerxp/postproc/vf_raw.c
    mplayerxp/postproc/vf_rectangle.c
    mplayerxp/postproc/vf_rgb2bgr.c
    mplayerxp/postproc/vf_rotate.c
    mplayerxp/postproc/vf_scale.c
    mplayerxp/postproc/vf_smartblur.c
    mplayerxp/postproc/vf_softpulldown.c
    mplayerxp/postproc/vf_swapuv.c
    mplayerxp/postproc/vf_test.c
    mplayerxp/postproc/vf_unsharp.c
    mplayerxp/postproc/vf_yuy2.c
    mplayerxp/postproc/vf_yvu9.c

Added Paths:
-----------
    mplayerxp/osdep/aclib.c
    mplayerxp/osdep/aclib_template.c
    mplayerxp/osdep/fastmemcpy.h

Removed Paths:
-------------
    mplayerxp/libvo/aclib.c
    mplayerxp/libvo/aclib_template.c
    mplayerxp/libvo/fastmemcpy.h

Modified: mplayerxp/libao2/ao_sdl.c
===================================================================
--- mplayerxp/libao2/ao_sdl.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libao2/ao_sdl.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -17,7 +17,7 @@
 #include "audio_out_internal.h"
 #include "afmt.h"
 #include <SDL/SDL.h>
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "ao_msg.h"
 
 static ao_info_t info = 

Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libmpcodecs/ad_mp3.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -3,11 +3,11 @@
 #include <unistd.h>
 #include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
 #include "ad_internal.h"
-#include "libvo/fastmemcpy.h"
 #include "mp_config.h"
 #include "mplayer.h"
 #include "osdep/cpudetect.h"
 #include "osdep/mm_accel.h"
+#include "osdep/fastmemcpy.h"
 #include "codecs_ld.h"
 #include "libao2/afmt.h"
 #include "libao2/audio_out.h"

Modified: mplayerxp/libmpcodecs/dec_audio.c
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libmpcodecs/dec_audio.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -16,10 +16,10 @@
 #include "ad.h"
 #include "libao2/afmt.h"
 #include "libao2/audio_out.h"
-#include "../mplayer.h"
+#include "mplayer.h"
 #include "libmpdemux/demuxer_r.h"
 #include "postproc/af.h"
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "ad_msg.h"
 
 #ifdef USE_FAKE_MONO

Modified: mplayerxp/libmpcodecs/vd_xanim.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libmpcodecs/vd_xanim.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -20,7 +20,7 @@
 
 #include "libvo/img_format.h"
 #include "osdep/timer.h"
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "mp_config.h"
 #include "vd_internal.h"
 #include "codecs_ld.h"

Modified: mplayerxp/libmpdemux/cache2.c
===================================================================
--- mplayerxp/libmpdemux/cache2.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libmpdemux/cache2.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -18,7 +18,7 @@
 #include "osdep/timer.h"
 #include "osdep/cpudetect.h"
 #include "osdep/bswap.h"
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "help_mp.h"
 #include "mpdemux.h"
 #include "mplayer.h"

Modified: mplayerxp/libmpdemux/demux_bmp.c
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libmpdemux/demux_bmp.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -8,15 +8,15 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 #include "help_mp.h"
 
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "../libvo/img_format.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/img_format.h"
+#include "osdep/fastmemcpy.h"
 
 #ifdef HAVE_SDL_IMAGE
 #include <SDL/SDL_image.h>

Modified: mplayerxp/libmpdemux/demuxer.c
===================================================================
--- mplayerxp/libmpdemux/demuxer.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libmpdemux/demuxer.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -10,9 +10,9 @@
 #include <sys/stat.h>
 
 #include "stream.h"
-#include "../mp_config.h"
-#include "../help_mp.h"
-#include "../mplayer.h"
+#include "mp_config.h"
+#include "help_mp.h"
+#include "mplayer.h"
 #include "libmpsub/subreader.h"
 #include "libmpconf/cfgparser.h"
 #include "nls/nls.h"
@@ -20,7 +20,7 @@
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "libvo/sub.h"
 #include "demux_msg.h"
 

Modified: mplayerxp/libmpdemux/s_tv.c
===================================================================
--- mplayerxp/libmpdemux/s_tv.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libmpdemux/s_tv.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "stream.h"
-#include "../input/input.h"
+#include "input/input.h"
 #include "mrl.h"
 
 /* some default values */
@@ -61,10 +61,10 @@
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "../libao2/afmt.h"
-#include "../libvo/img_format.h"
-#include "../libvo/fastmemcpy.h"
-#include "../libao2/audio_out.h"
+#include "libao2/afmt.h"
+#include "libvo/img_format.h"
+#include "osdep/fastmemcpy.h"
+#include "libao2/audio_out.h"
 
 #include "tv.h"
 

Modified: mplayerxp/libmpdemux/stream.c
===================================================================
--- mplayerxp/libmpdemux/stream.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libmpdemux/stream.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -10,11 +10,11 @@
 #include <signal.h>
 #include <sys/wait.h>
 
-#include "../mp_config.h"
-#include "../mplayer.h"
+#include "mp_config.h"
+#include "mplayer.h"
 #include "help_mp.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 
 #include "stream.h"
 #include "demuxer.h"

Modified: mplayerxp/libvo/Makefile
===================================================================
--- mplayerxp/libvo/Makefile	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/Makefile	2012-10-29 12:34:45 UTC (rev 245)
@@ -3,7 +3,7 @@
 
 LIBNAME = libvo.a
 
-SRCS=aspect.c aclib.c osd.c font_load.c video_out.c vo_null.c img_format.c sub.c screenshot.c
+SRCS=aspect.c osd.c font_load.c video_out.c vo_null.c img_format.c sub.c screenshot.c
 ifeq ($(HAVE_SDL),yes)
 SRCS+=vo_sdl.c
 endif

Deleted: mplayerxp/libvo/aclib.c
===================================================================
--- mplayerxp/libvo/aclib.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/aclib.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -1,98 +0,0 @@
-#include <stdio.h>
-#include <pthread.h>
-#include "mp_config.h"
-#include "mplayer.h"
-#define MSGT_CLASS MSGT_GLOBAL
-#include "__mp_msg.h"
-
-#if defined(USE_FASTMEMCPY)
-#include "fastmemcpy.h"
-#include "osdep/cpudetect.h"
-
-#define BLOCK_SIZE 4096
-#define CONFUSION_FACTOR 0
-
-#define PVECTOR_ACCEL_H "aclib_template.c"
-#include "pvector/pvector_inc.h"
-
-/*
-  aclib - advanced C library ;)
-  This file contains functions which improve and expand standard C-library
-  see aclib_template.c ... this file only contains runtime cpu detection and config options stuff
-  runtime cpu detection by michael niedermayer (mic...@gm...) is under GPL
-*/
-
-static any_t* init_fast_memcpy(any_t* to, const any_t* from, size_t len)
-{
-#ifdef __SSE2__
-	if(gCpuCaps.hasSSE2)
-	{
-		MSG_V("Using SSE2 optimized memcpy\n");
-		fast_memcpy_ptr = fast_memcpy_SSE2;
-	}
-	else
-#endif
-#ifndef __x86_64__
-#ifdef __SSE__
-	if(gCpuCaps.hasMMX2)
-	{
-		MSG_V("Using MMX2 optimized memcpy\n");
-		fast_memcpy_ptr = fast_memcpy_SSE;
-	}
-	else
-#endif
-//#ifdef __MMX__
-//	if(gCpuCaps.hasMMX)
-//	{
-//		MSG_V("Using MMX optimized memcpy\n");
-//		fast_memcpy_ptr = fast_memcpy_MMX;
-//	}
-//	else
-//#endif
-#endif
-	{
-		MSG_V("Using generic memcpy\n");
-		fast_memcpy_ptr = memcpy; /* prior to mmx we use the standart memcpy */
-	}
-	return (*fast_memcpy_ptr)(to,from,len);
-}
-
-static any_t* init_stream_copy(any_t* to, const any_t* from, size_t len)
-{
-#ifdef __SSE2__
-	if(gCpuCaps.hasSSE2)
-	{
-		MSG_V("Using SSE2 optimized agpcpy\n");
-		fast_stream_copy_ptr = fast_stream_copy_SSE2;
-	}
-#endif
-#ifndef __x86_64__
-#ifdef __SSE__
-	if(gCpuCaps.hasMMX2)
-	{
-		MSG_V("Using MMX2 optimized agpcpy\n");
-		fast_stream_copy_ptr = fast_stream_copy_SSE;
-	}
-	else
-#endif
-//#ifdef __MMX__
-//	if(gCpuCaps.hasMMX)
-//	{
-//		MSG_V("Using MMX optimized agpcpy\n");
-//		fast_stream_copy_ptr = fast_stream_copy_MMX;
-//	}
-//	else
-//#endif
-#endif
-	{
-		MSG_V("Using generic optimized agpcpy\n");
-		fast_stream_copy_ptr = memcpy; /* prior to mmx we use the standart memcpy */
-	}
-	return (*fast_stream_copy_ptr)(to,from,len);
-}
-
-any_t*(*fast_memcpy_ptr)(any_t* to, const any_t* from, size_t len) = init_fast_memcpy;
-any_t*(*fast_stream_copy_ptr)(any_t* to, const any_t* from, size_t len) = init_stream_copy;
-
-#endif /* use fastmemcpy */
-

Deleted: mplayerxp/libvo/aclib_template.c
===================================================================
--- mplayerxp/libvo/aclib_template.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/aclib_template.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -1,179 +0,0 @@
-/*
-  aclib - advanced C library ;)
-  This file contains functions which improve and expand standard C-library
-*/
-#include "pvector/pvector.h"
-
-#ifdef HAVE_INT_PVECTOR
-/* for small memory blocks (<256 bytes) this version is faster */
-#undef small_memcpy
-#ifdef __x86_64__
-#define small_memcpy(to,from,n)\
-{\
-register unsigned long int siz;\
-register unsigned long int dummy;\
-    siz=n&0x7;  n>>=3;\
-    if(siz)\
-__asm__ __volatile__(\
-	"rep; movsb"\
-	:"=&D"(to), "=&S"(from), "=&c"(dummy)\
-/* It's most portable way to notify compiler */\
-/* that edi, esi and ecx are clobbered in asm block. */\
-/* Thanks to A'rpi for hint!!! */\
-	:"0" (to), "1" (from),"2" (siz)\
-	: "memory","cc");\
-    if(n)\
-__asm__ __volatile__(\
-	"rep; movsq"\
-	:"=&D"(to), "=&S"(from), "=&c"(dummy)\
-/* It's most portable way to notify compiler */\
-/* that edi, esi and ecx are clobbered in asm block. */\
-/* Thanks to A'rpi for hint!!! */\
-	:"0" (to), "1" (from),"2" (n)\
-	: "memory","cc");\
-}
-#else
-#define small_memcpy(to,from,n)\
-{\
-register unsigned long int dummy;\
-__asm__ __volatile__(\
-	"rep; movsb"\
-	:"=&D"(to), "=&S"(from), "=&c"(dummy)\
-/* It's most portable way to notify compiler */\
-/* that edi, esi and ecx are clobbered in asm block. */\
-/* Thanks to A'rpi for hint!!! */\
-	:"0" (to), "1" (from),"2" (n)\
-	: "memory","cc");\
-}
-#endif
-
-#undef MIN_LEN
-#if defined( OPTIMIZE_MMX ) && !defined( OPTIMIZE_MMX2 )
-#define MIN_LEN 0x800  /* 2K blocks. Was found experimentally */
-#else
-#define MIN_LEN __IVEC_SIZE*8
-#endif
-
-#undef FAST_MEMORY_COPY
-#define FAST_MEMORY_COPY(to,from, len)\
-{\
-    any_t*retval;\
-    const unsigned char *cfrom=from;\
-    unsigned char *tto=to;\
-    const unsigned block_size = __IVEC_SIZE*8;\
-    __ivec iarr[8];\
-    size_t i;\
-    retval = to;\
-    if(!len) return retval;\
-\
-    _ivec_prefetch(&cfrom[0]);\
-    _ivec_prefetch(&cfrom[32]);\
-    _ivec_prefetch(&cfrom[64]);\
-    _ivec_prefetch(&cfrom[96]);\
-    _ivec_prefetch(&cfrom[128]);\
-    _ivec_prefetch(&cfrom[160]);\
-    _ivec_prefetch(&cfrom[192]);\
-    _ivec_prefetch(&cfrom[224]);\
-    _ivec_prefetch(&cfrom[256]);\
-\
-    if(len >= MIN_LEN)\
-    {\
-	register unsigned long int delta;\
-	/* Align destinition to cache-line size -boundary */\
-	delta = ((unsigned long int)tto)&(gCpuCaps.cl_size-1);\
-	if(delta) {\
-	    delta=gCpuCaps.cl_size-delta;\
-	    len -= delta;\
-	    small_memcpy(tto, cfrom, delta);\
-	}\
-	i = len/block_size;\
-	len&=(block_size-1);\
-	/*\
-	   This algorithm is top effective when the code consequently\
-	   reads and writes blocks which have size of cache line.\
-	   Size of cache line is processor-dependent.\
-	   It will, however, be a minimum of 32 bytes on any processors.\
-	   It would be better to have a number of instructions which\
-	   perform reading and writing to be multiple to a number of\
-	   processor's decoders, but it's not always possible.\
-	*/\
-	if(((unsigned long)cfrom) & 15)\
-	/* if SRC is misaligned */\
-	for(; i>0; i--)\
-	{\
-	    _ivec_prefetch(&cfrom[__IVEC_SIZE*8]);\
-	    _ivec_prefetch(&cfrom[__IVEC_SIZE*8+32]);\
-	    iarr[0] = _ivec_loadu(&cfrom[__IVEC_SIZE*0]);\
-	    iarr[1] = _ivec_loadu(&cfrom[__IVEC_SIZE*1]);\
-	    iarr[2] = _ivec_loadu(&cfrom[__IVEC_SIZE*2]);\
-	    iarr[3] = _ivec_loadu(&cfrom[__IVEC_SIZE*3]);\
-	    iarr[4] = _ivec_loadu(&cfrom[__IVEC_SIZE*4]);\
-	    iarr[5] = _ivec_loadu(&cfrom[__IVEC_SIZE*5]);\
-	    iarr[6] = _ivec_loadu(&cfrom[__IVEC_SIZE*6]);\
-	    iarr[7] = _ivec_loadu(&cfrom[__IVEC_SIZE*7]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*0],iarr[0]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*1],iarr[1]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*2],iarr[2]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*3],iarr[3]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*4],iarr[4]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*5],iarr[5]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*6],iarr[6]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*7],iarr[7]);\
-	    cfrom+=block_size;\
-	    tto+=block_size;\
-	}\
-	else\
-	/* if SRC is aligned */\
-	for(; i>0; i--)\
-	{\
-	    _ivec_prefetch(&cfrom[__IVEC_SIZE*8]);\
-	    _ivec_prefetch(&cfrom[__IVEC_SIZE*8+32]);\
-	    iarr[0] = _ivec_loada(&cfrom[__IVEC_SIZE*0]);\
-	    iarr[1] = _ivec_loada(&cfrom[__IVEC_SIZE*1]);\
-	    iarr[2] = _ivec_loada(&cfrom[__IVEC_SIZE*2]);\
-	    iarr[3] = _ivec_loada(&cfrom[__IVEC_SIZE*3]);\
-	    iarr[4] = _ivec_loada(&cfrom[__IVEC_SIZE*4]);\
-	    iarr[5] = _ivec_loada(&cfrom[__IVEC_SIZE*5]);\
-	    iarr[6] = _ivec_loada(&cfrom[__IVEC_SIZE*6]);\
-	    iarr[7] = _ivec_loada(&cfrom[__IVEC_SIZE*7]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*0],iarr[0]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*1],iarr[1]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*2],iarr[2]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*3],iarr[3]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*4],iarr[4]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*5],iarr[5]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*6],iarr[6]);\
-	    MEM_STORE(&tto[__IVEC_SIZE*7],iarr[7]);\
-	    cfrom+=block_size;\
-	    tto+=block_size;\
-	}\
-	MEM_SFENCE\
-	_ivec_empty();\
-    }\
-    /*\
-     *	Now do the tail of the block\
-     */\
-    if(len) small_memcpy(tto, cfrom, len);\
-    return retval;\
-}
-
-#undef MEM_STORE
-#undef MEM_SFENCE
-#define MEM_STORE  _ivec_stream
-#define MEM_SFENCE _ivec_sfence();
-static inline any_t* PVECTOR_RENAME(fast_stream_copy)(any_t* to, const any_t* from, size_t len)
-{
-    MSG_DBG3("fast_stream_copy(%p, %p, %u) [cl_size=%u]\n",to,from,len,gCpuCaps.cl_size);
-    FAST_MEMORY_COPY(to,from,len);
-}
-
-#undef MEM_STORE
-#undef MEM_SFENCE
-#define MEM_STORE _ivec_storea
-#define MEM_SFENCE
-static inline any_t* PVECTOR_RENAME(fast_memcpy)(any_t* to, const any_t* from, size_t len)
-{
-    MSG_DBG3("fast_memcpy(%p, %p, %u) [cl_size=%u]\n",to,from,len,gCpuCaps.cl_size);
-    FAST_MEMORY_COPY(to,from,len);
-}
-#endif

Deleted: mplayerxp/libvo/fastmemcpy.h
===================================================================
--- mplayerxp/libvo/fastmemcpy.h	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/fastmemcpy.h	2012-10-29 12:34:45 UTC (rev 245)
@@ -1,55 +0,0 @@
-#ifndef __MPLAYER_MEMCPY
-#define __MPLAYER_MEMCPY 1
-
-#include "../mp_config.h"
-
-#ifdef USE_FASTMEMCPY
-#include <stddef.h>
-#include <string.h> /* memcpy prototypes */
-extern any_t* (*fast_memcpy_ptr)(any_t* to, const any_t* from, size_t len);
-extern any_t* (*fast_stream_copy_ptr)(any_t* to, const any_t* from, size_t len);
-#define memcpy(a,b,c) (*fast_memcpy_ptr)(a,b,c)
-#define stream_copy(a,b,c) (*fast_stream_copy_ptr)(a,b,c)
-#else
-#define stream_copy(a,b,c) memcpy(a,b,c)
-#endif
-
-static inline any_t* stream_copy_pic(any_t* dst, const any_t* src, int bytesPerLine, int height, int dstStride, int srcStride)
-{
-	int i;
-	any_t*retval=dst;
-
-	if(dstStride == srcStride) stream_copy(dst, src, srcStride*height);
-	else
-	{
-		for(i=0; i<height; i++)
-		{
-			stream_copy(dst, src, bytesPerLine);
-			src+= srcStride;
-			dst+= dstStride;
-		}
-	}
-
-	return retval;
-}
-
-static inline any_t* memcpy_pic(any_t* dst, const any_t* src, int bytesPerLine, int height, int dstStride, int srcStride)
-{
-	int i;
-	any_t*retval=dst;
-
-	if(dstStride == srcStride) memcpy(dst, src, srcStride*height);
-	else
-	{
-		for(i=0; i<height; i++)
-		{
-			memcpy(dst, src, bytesPerLine);
-			src+= srcStride;
-			dst+= dstStride;
-		}
-	}
-
-	return retval;
-}
-
-#endif

Modified: mplayerxp/libvo/video_out.c
===================================================================
--- mplayerxp/libvo/video_out.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/video_out.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -35,7 +35,7 @@
 #include "xmp_core.h"
 #include "osdep/my_malloc.h"
 #include "mplayer.h"
-#include "fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "img_format.h"
 #include "screenshot.h"
 #include "osdep/bswap.h"

Modified: mplayerxp/libvo/vo_dga.c
===================================================================
--- mplayerxp/libvo/vo_dga.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/vo_dga.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -20,8 +20,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "../mp_config.h"
-#include "../mplayer.h"
+#include "mp_config.h"
+#include "mplayer.h"
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "aspect.h"
@@ -37,7 +37,7 @@
 
 
 #include "x11_common.h"
-#include "fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "dri_vo.h"
 //#define VO_DGA_DBG 1
 //#undef HAVE_DGA2

Modified: mplayerxp/libvo/vo_fbdev.c
===================================================================
--- mplayerxp/libvo/vo_fbdev.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/vo_fbdev.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -23,10 +23,10 @@
 #include <linux/fb.h>
 
 #include "mp_config.h"
-#include "../mplayer.h"
+#include "mplayer.h"
 #include "video_out.h"
 #include "video_out_internal.h"
-#include "fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "sub.h"
 #ifdef CONFIG_VIDIX
 #include "vosub_vidix.h"
@@ -34,7 +34,7 @@
 #include "aspect.h"
 #include "osd.h"
 #include "dri_vo.h"
-#include "../libmpdemux/mrl.h"
+#include "libmpdemux/mrl.h"
 
 LIBVO_EXTERN(fbdev)
 

Modified: mplayerxp/libvo/vo_opengl.c
===================================================================
--- mplayerxp/libvo/vo_opengl.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/vo_opengl.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -51,7 +51,7 @@
 #ifdef CONFIG_GUI
 #include "gui/interface.h"
 #endif
-#include "fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "postproc/vfcap.h"
 #include "vo_msg.h"
 

Modified: mplayerxp/libvo/vo_sdl.c
===================================================================
--- mplayerxp/libvo/vo_sdl.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/vo_sdl.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -113,7 +113,7 @@
 
 #include "video_out.h"
 
-#include "fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "sub.h"
 #include "aspect.h"
 

Modified: mplayerxp/libvo/vo_vesa.c
===================================================================
--- mplayerxp/libvo/vo_vesa.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/vo_vesa.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -34,7 +34,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 
-#include "fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "sub.h"
 #include "osdep/vbelib.h"
 #include "osdep/bswap.h"

Modified: mplayerxp/libvo/vo_x11.c
===================================================================
--- mplayerxp/libvo/vo_x11.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/vo_x11.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -38,7 +38,7 @@
 
 #include "x11_common.h"
 
-#include "fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "sub.h"
 
 #include "postproc/swscale.h" /* for MODE_RGB(BGR) definitions */

Modified: mplayerxp/libvo/vo_xv.c
===================================================================
--- mplayerxp/libvo/vo_xv.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/vo_xv.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -31,7 +31,7 @@
 
 #include "x11_common.h"
 
-#include "fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "sub.h"
 #include "aspect.h"
 #include "dri_vo.h"

Modified: mplayerxp/libvo/vosub_vidix.c
===================================================================
--- mplayerxp/libvo/vosub_vidix.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/libvo/vosub_vidix.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -20,8 +20,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "../mp_config.h"
-#include "../mplayer.h"
+#include "mp_config.h"
+#include "mplayer.h"
 #ifdef HAVE_MEMALIGN
 #include <malloc.h>
 #endif
@@ -30,12 +30,12 @@
 
 #include "video_out.h"
 #include "vosub_vidix.h"
-#include "fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "osd.h"
 #include "sub.h"
 #include "video_out.h"
 #include "dri_vo.h"
-#include "../mp_image.h"
+#include "mp_image.h"
 #include "vo_msg.h"
 
 #ifndef min

Modified: mplayerxp/mp_image.c
===================================================================
--- mplayerxp/mp_image.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/mp_image.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -11,7 +11,7 @@
 
 #include "libvo/img_format.h"
 #include "mp_image.h"
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #define MSGT_CLASS MSGT_CPLAYER
 #include "__mp_msg.h"
 

Modified: mplayerxp/osdep/Makefile
===================================================================
--- mplayerxp/osdep/Makefile	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/osdep/Makefile	2012-10-29 12:34:45 UTC (rev 245)
@@ -3,7 +3,7 @@
 
 LIBNAME = libosdep.a
 
-SRCS=cpudetect.c getch2.c timer-lx.c timer.c shmem.c get_path.c my_malloc.c my_profile.c
+SRCS=aclib.c cpudetect.c getch2.c timer-lx.c timer.c shmem.c get_path.c my_malloc.c my_profile.c
 OBJS=$(SRCS:.c=.o)
 
 ifeq ($(TARGET_OS),LINUX_GNU)

Copied: mplayerxp/osdep/aclib.c (from rev 244, mplayerxp/libvo/aclib.c)
===================================================================
--- mplayerxp/osdep/aclib.c	                        (rev 0)
+++ mplayerxp/osdep/aclib.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -0,0 +1,98 @@
+#include <stdio.h>
+#include <pthread.h>
+#include "mp_config.h"
+#include "mplayer.h"
+#define MSGT_CLASS MSGT_GLOBAL
+#include "__mp_msg.h"
+
+#if defined(USE_FASTMEMCPY)
+#include "fastmemcpy.h"
+#include "osdep/cpudetect.h"
+
+#define BLOCK_SIZE 4096
+#define CONFUSION_FACTOR 0
+
+#define PVECTOR_ACCEL_H "aclib_template.c"
+#include "pvector/pvector_inc.h"
+
+/*
+  aclib - advanced C library ;)
+  This file contains functions which improve and expand standard C-library
+  see aclib_template.c ... this file only contains runtime cpu detection and config options stuff
+  runtime cpu detection by michael niedermayer (mic...@gm...) is under GPL
+*/
+
+static any_t* init_fast_memcpy(any_t* to, const any_t* from, size_t len)
+{
+#ifdef __SSE2__
+	if(gCpuCaps.hasSSE2)
+	{
+		MSG_V("Using SSE2 optimized memcpy\n");
+		fast_memcpy_ptr = fast_memcpy_SSE2;
+	}
+	else
+#endif
+#ifndef __x86_64__
+#ifdef __SSE__
+	if(gCpuCaps.hasMMX2)
+	{
+		MSG_V("Using MMX2 optimized memcpy\n");
+		fast_memcpy_ptr = fast_memcpy_SSE;
+	}
+	else
+#endif
+//#ifdef __MMX__
+//	if(gCpuCaps.hasMMX)
+//	{
+//		MSG_V("Using MMX optimized memcpy\n");
+//		fast_memcpy_ptr = fast_memcpy_MMX;
+//	}
+//	else
+//#endif
+#endif
+	{
+		MSG_V("Using generic memcpy\n");
+		fast_memcpy_ptr = memcpy; /* prior to mmx we use the standart memcpy */
+	}
+	return (*fast_memcpy_ptr)(to,from,len);
+}
+
+static any_t* init_stream_copy(any_t* to, const any_t* from, size_t len)
+{
+#ifdef __SSE2__
+	if(gCpuCaps.hasSSE2)
+	{
+		MSG_V("Using SSE2 optimized agpcpy\n");
+		fast_stream_copy_ptr = fast_stream_copy_SSE2;
+	}
+#endif
+#ifndef __x86_64__
+#ifdef __SSE__
+	if(gCpuCaps.hasMMX2)
+	{
+		MSG_V("Using MMX2 optimized agpcpy\n");
+		fast_stream_copy_ptr = fast_stream_copy_SSE;
+	}
+	else
+#endif
+//#ifdef __MMX__
+//	if(gCpuCaps.hasMMX)
+//	{
+//		MSG_V("Using MMX optimized agpcpy\n");
+//		fast_stream_copy_ptr = fast_stream_copy_MMX;
+//	}
+//	else
+//#endif
+#endif
+	{
+		MSG_V("Using generic optimized agpcpy\n");
+		fast_stream_copy_ptr = memcpy; /* prior to mmx we use the standart memcpy */
+	}
+	return (*fast_stream_copy_ptr)(to,from,len);
+}
+
+any_t*(*fast_memcpy_ptr)(any_t* to, const any_t* from, size_t len) = init_fast_memcpy;
+any_t*(*fast_stream_copy_ptr)(any_t* to, const any_t* from, size_t len) = init_stream_copy;
+
+#endif /* use fastmemcpy */
+

Copied: mplayerxp/osdep/aclib_template.c (from rev 229, mplayerxp/libvo/aclib_template.c)
===================================================================
--- mplayerxp/osdep/aclib_template.c	                        (rev 0)
+++ mplayerxp/osdep/aclib_template.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -0,0 +1,179 @@
+/*
+  aclib - advanced C library ;)
+  This file contains functions which improve and expand standard C-library
+*/
+#include "pvector/pvector.h"
+
+#ifdef HAVE_INT_PVECTOR
+/* for small memory blocks (<256 bytes) this version is faster */
+#undef small_memcpy
+#ifdef __x86_64__
+#define small_memcpy(to,from,n)\
+{\
+register unsigned long int siz;\
+register unsigned long int dummy;\
+    siz=n&0x7;  n>>=3;\
+    if(siz)\
+__asm__ __volatile__(\
+	"rep; movsb"\
+	:"=&D"(to), "=&S"(from), "=&c"(dummy)\
+/* It's most portable way to notify compiler */\
+/* that edi, esi and ecx are clobbered in asm block. */\
+/* Thanks to A'rpi for hint!!! */\
+	:"0" (to), "1" (from),"2" (siz)\
+	: "memory","cc");\
+    if(n)\
+__asm__ __volatile__(\
+	"rep; movsq"\
+	:"=&D"(to), "=&S"(from), "=&c"(dummy)\
+/* It's most portable way to notify compiler */\
+/* that edi, esi and ecx are clobbered in asm block. */\
+/* Thanks to A'rpi for hint!!! */\
+	:"0" (to), "1" (from),"2" (n)\
+	: "memory","cc");\
+}
+#else
+#define small_memcpy(to,from,n)\
+{\
+register unsigned long int dummy;\
+__asm__ __volatile__(\
+	"rep; movsb"\
+	:"=&D"(to), "=&S"(from), "=&c"(dummy)\
+/* It's most portable way to notify compiler */\
+/* that edi, esi and ecx are clobbered in asm block. */\
+/* Thanks to A'rpi for hint!!! */\
+	:"0" (to), "1" (from),"2" (n)\
+	: "memory","cc");\
+}
+#endif
+
+#undef MIN_LEN
+#if defined( OPTIMIZE_MMX ) && !defined( OPTIMIZE_MMX2 )
+#define MIN_LEN 0x800  /* 2K blocks. Was found experimentally */
+#else
+#define MIN_LEN __IVEC_SIZE*8
+#endif
+
+#undef FAST_MEMORY_COPY
+#define FAST_MEMORY_COPY(to,from, len)\
+{\
+    any_t*retval;\
+    const unsigned char *cfrom=from;\
+    unsigned char *tto=to;\
+    const unsigned block_size = __IVEC_SIZE*8;\
+    __ivec iarr[8];\
+    size_t i;\
+    retval = to;\
+    if(!len) return retval;\
+\
+    _ivec_prefetch(&cfrom[0]);\
+    _ivec_prefetch(&cfrom[32]);\
+    _ivec_prefetch(&cfrom[64]);\
+    _ivec_prefetch(&cfrom[96]);\
+    _ivec_prefetch(&cfrom[128]);\
+    _ivec_prefetch(&cfrom[160]);\
+    _ivec_prefetch(&cfrom[192]);\
+    _ivec_prefetch(&cfrom[224]);\
+    _ivec_prefetch(&cfrom[256]);\
+\
+    if(len >= MIN_LEN)\
+    {\
+	register unsigned long int delta;\
+	/* Align destinition to cache-line size -boundary */\
+	delta = ((unsigned long int)tto)&(gCpuCaps.cl_size-1);\
+	if(delta) {\
+	    delta=gCpuCaps.cl_size-delta;\
+	    len -= delta;\
+	    small_memcpy(tto, cfrom, delta);\
+	}\
+	i = len/block_size;\
+	len&=(block_size-1);\
+	/*\
+	   This algorithm is top effective when the code consequently\
+	   reads and writes blocks which have size of cache line.\
+	   Size of cache line is processor-dependent.\
+	   It will, however, be a minimum of 32 bytes on any processors.\
+	   It would be better to have a number of instructions which\
+	   perform reading and writing to be multiple to a number of\
+	   processor's decoders, but it's not always possible.\
+	*/\
+	if(((unsigned long)cfrom) & 15)\
+	/* if SRC is misaligned */\
+	for(; i>0; i--)\
+	{\
+	    _ivec_prefetch(&cfrom[__IVEC_SIZE*8]);\
+	    _ivec_prefetch(&cfrom[__IVEC_SIZE*8+32]);\
+	    iarr[0] = _ivec_loadu(&cfrom[__IVEC_SIZE*0]);\
+	    iarr[1] = _ivec_loadu(&cfrom[__IVEC_SIZE*1]);\
+	    iarr[2] = _ivec_loadu(&cfrom[__IVEC_SIZE*2]);\
+	    iarr[3] = _ivec_loadu(&cfrom[__IVEC_SIZE*3]);\
+	    iarr[4] = _ivec_loadu(&cfrom[__IVEC_SIZE*4]);\
+	    iarr[5] = _ivec_loadu(&cfrom[__IVEC_SIZE*5]);\
+	    iarr[6] = _ivec_loadu(&cfrom[__IVEC_SIZE*6]);\
+	    iarr[7] = _ivec_loadu(&cfrom[__IVEC_SIZE*7]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*0],iarr[0]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*1],iarr[1]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*2],iarr[2]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*3],iarr[3]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*4],iarr[4]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*5],iarr[5]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*6],iarr[6]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*7],iarr[7]);\
+	    cfrom+=block_size;\
+	    tto+=block_size;\
+	}\
+	else\
+	/* if SRC is aligned */\
+	for(; i>0; i--)\
+	{\
+	    _ivec_prefetch(&cfrom[__IVEC_SIZE*8]);\
+	    _ivec_prefetch(&cfrom[__IVEC_SIZE*8+32]);\
+	    iarr[0] = _ivec_loada(&cfrom[__IVEC_SIZE*0]);\
+	    iarr[1] = _ivec_loada(&cfrom[__IVEC_SIZE*1]);\
+	    iarr[2] = _ivec_loada(&cfrom[__IVEC_SIZE*2]);\
+	    iarr[3] = _ivec_loada(&cfrom[__IVEC_SIZE*3]);\
+	    iarr[4] = _ivec_loada(&cfrom[__IVEC_SIZE*4]);\
+	    iarr[5] = _ivec_loada(&cfrom[__IVEC_SIZE*5]);\
+	    iarr[6] = _ivec_loada(&cfrom[__IVEC_SIZE*6]);\
+	    iarr[7] = _ivec_loada(&cfrom[__IVEC_SIZE*7]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*0],iarr[0]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*1],iarr[1]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*2],iarr[2]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*3],iarr[3]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*4],iarr[4]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*5],iarr[5]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*6],iarr[6]);\
+	    MEM_STORE(&tto[__IVEC_SIZE*7],iarr[7]);\
+	    cfrom+=block_size;\
+	    tto+=block_size;\
+	}\
+	MEM_SFENCE\
+	_ivec_empty();\
+    }\
+    /*\
+     *	Now do the tail of the block\
+     */\
+    if(len) small_memcpy(tto, cfrom, len);\
+    return retval;\
+}
+
+#undef MEM_STORE
+#undef MEM_SFENCE
+#define MEM_STORE  _ivec_stream
+#define MEM_SFENCE _ivec_sfence();
+static inline any_t* PVECTOR_RENAME(fast_stream_copy)(any_t* to, const any_t* from, size_t len)
+{
+    MSG_DBG3("fast_stream_copy(%p, %p, %u) [cl_size=%u]\n",to,from,len,gCpuCaps.cl_size);
+    FAST_MEMORY_COPY(to,from,len);
+}
+
+#undef MEM_STORE
+#undef MEM_SFENCE
+#define MEM_STORE _ivec_storea
+#define MEM_SFENCE
+static inline any_t* PVECTOR_RENAME(fast_memcpy)(any_t* to, const any_t* from, size_t len)
+{
+    MSG_DBG3("fast_memcpy(%p, %p, %u) [cl_size=%u]\n",to,from,len,gCpuCaps.cl_size);
+    FAST_MEMORY_COPY(to,from,len);
+}
+#endif

Copied: mplayerxp/osdep/fastmemcpy.h (from rev 229, mplayerxp/libvo/fastmemcpy.h)
===================================================================
--- mplayerxp/osdep/fastmemcpy.h	                        (rev 0)
+++ mplayerxp/osdep/fastmemcpy.h	2012-10-29 12:34:45 UTC (rev 245)
@@ -0,0 +1,55 @@
+#ifndef __MPLAYER_MEMCPY
+#define __MPLAYER_MEMCPY 1
+
+#include "../mp_config.h"
+
+#ifdef USE_FASTMEMCPY
+#include <stddef.h>
+#include <string.h> /* memcpy prototypes */
+extern any_t* (*fast_memcpy_ptr)(any_t* to, const any_t* from, size_t len);
+extern any_t* (*fast_stream_copy_ptr)(any_t* to, const any_t* from, size_t len);
+#define memcpy(a,b,c) (*fast_memcpy_ptr)(a,b,c)
+#define stream_copy(a,b,c) (*fast_stream_copy_ptr)(a,b,c)
+#else
+#define stream_copy(a,b,c) memcpy(a,b,c)
+#endif
+
+static inline any_t* stream_copy_pic(any_t* dst, const any_t* src, int bytesPerLine, int height, int dstStride, int srcStride)
+{
+	int i;
+	any_t*retval=dst;
+
+	if(dstStride == srcStride) stream_copy(dst, src, srcStride*height);
+	else
+	{
+		for(i=0; i<height; i++)
+		{
+			stream_copy(dst, src, bytesPerLine);
+			src+= srcStride;
+			dst+= dstStride;
+		}
+	}
+
+	return retval;
+}
+
+static inline any_t* memcpy_pic(any_t* dst, const any_t* src, int bytesPerLine, int height, int dstStride, int srcStride)
+{
+	int i;
+	any_t*retval=dst;
+
+	if(dstStride == srcStride) memcpy(dst, src, srcStride*height);
+	else
+	{
+		for(i=0; i<height; i++)
+		{
+			memcpy(dst, src, bytesPerLine);
+			src+= srcStride;
+			dst+= dstStride;
+		}
+	}
+
+	return retval;
+}
+
+#endif

Modified: mplayerxp/postproc/af_export.c
===================================================================
--- mplayerxp/postproc/af_export.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/af_export.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -1,7 +1,7 @@
 /* This audio filter exports the incomming signal to other processes
    using memory mapping. Memory mapped area contains a header: 
-      int nch, 
-      int size, 
+      int nch,
+      int size,
       unsigned long long counter (updated every time the  contents of
                                   the area changes),
    the rest is payload (non-interleaved).
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <unistd.h>
-#include "../mp_config.h"
+#include "mp_config.h"
 
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/types.h>
@@ -22,9 +22,9 @@
 #include <fcntl.h>
 
 #include "af.h"
-#include "../help_mp.h"
-#include "../osdep/get_path.h"
-#include "libvo/fastmemcpy.h"
+#include "help_mp.h"
+#include "osdep/get_path.h"
+#include "osdep/fastmemcpy.h"
 
 #define DEF_SZ 512 // default buffer size (in samples)
 #define SHARED_FILE "mplayer-af_export" /* default file name 

Modified: mplayerxp/postproc/af_ffenc.c
===================================================================
--- mplayerxp/postproc/af_ffenc.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/af_ffenc.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -4,8 +4,8 @@
 #include <dlfcn.h>
 #include "mp_config.h"
 #include "libavcodec/avcodec.h"
-#include "../libmpcodecs/codecs_ld.h"
-#include "../libvo/fastmemcpy.h"
+#include "libmpcodecs/codecs_ld.h"
+#include "osdep/fastmemcpy.h"
 #include "af.h"
 
 #define MIN_LIBAVCODEC_VERSION_INT	((51<<16)+(0<<8)+0)

Modified: mplayerxp/postproc/af_scaletempo.c
===================================================================
--- mplayerxp/postproc/af_scaletempo.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/af_scaletempo.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 
 #include "af.h"
 

Modified: mplayerxp/postproc/vf.c
===================================================================
--- mplayerxp/postproc/vf.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 #ifdef HAVE_MALLOC
 #include <malloc.h>
 #endif
@@ -15,7 +15,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "libmpconf/codec-cfg.h"
 #include "pp_msg.h"
 

Modified: mplayerxp/postproc/vf_delogo.c
===================================================================
--- mplayerxp/postproc/vf_delogo.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_delogo.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -34,7 +34,7 @@
 #include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "pp_msg.h"
 
 //===========================================================================//

Modified: mplayerxp/postproc/vf_denoise3d.c
===================================================================
--- mplayerxp/postproc/vf_denoise3d.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_denoise3d.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -22,16 +22,16 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
 #ifdef HAVE_MALLOC
 #include <malloc.h>
 #endif
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "pp_msg.h"
 
 #define PARAM1_DEFAULT 4.0

Modified: mplayerxp/postproc/vf_dint.c
===================================================================
--- mplayerxp/postproc/vf_dint.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_dint.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -3,11 +3,11 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../mp_config.h"
-#include "../libvo/fastmemcpy.h"
+#include "mp_config.h"
+#include "osdep/fastmemcpy.h"
 
 #include "mp_image.h"
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "vf.h"
 #include "pp_msg.h"
 

Modified: mplayerxp/postproc/vf_down3dright.c
===================================================================
--- mplayerxp/postproc/vf_down3dright.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_down3dright.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -10,7 +10,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "postproc/swscale.h"
 #include "pp_msg.h"
 

Modified: mplayerxp/postproc/vf_expand.c
===================================================================
--- mplayerxp/postproc/vf_expand.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_expand.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -4,18 +4,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 
 #ifdef OSD_SUPPORT
-#include "../libvo/video_out.h"
-#include "../libvo/sub.h"
-#include "../libvo/osd.h"
+#include "libvo/video_out.h"
+#include "libvo/sub.h"
+#include "libvo/osd.h"
 #endif
 #include "pp_msg.h"
 

Modified: mplayerxp/postproc/vf_il.c
===================================================================
--- mplayerxp/postproc/vf_il.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_il.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -22,16 +22,16 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
 #ifdef HAVE_MALLOC
 #include <malloc.h>
 #endif
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "pp_msg.h"
 
 

Modified: mplayerxp/postproc/vf_menu.c
===================================================================
--- mplayerxp/postproc/vf_menu.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_menu.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -16,7 +16,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "libvo/video_out.h"
 #include "libvo/font_load.h"
 #include "input/input.h"

Modified: mplayerxp/postproc/vf_mirror.c
===================================================================
--- mplayerxp/postproc/vf_mirror.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_mirror.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -3,14 +3,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
+#include "osdep/fastmemcpy.h"
+#include "postproc/swscale.h"
 #include "pp_msg.h"
 
 typedef void (* __FASTCALL__ mirror_f)(unsigned char* dst,unsigned char* src,unsigned dststride,unsigned srcstride,unsigned w,unsigned h,unsigned bpp,unsigned int fmt,int finalize);

Modified: mplayerxp/postproc/vf_noise.c
===================================================================
--- mplayerxp/postproc/vf_noise.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_noise.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -32,7 +32,7 @@
 #include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "pp_msg.h"
 
 #define MAX_NOISE 4096

Modified: mplayerxp/postproc/vf_panscan.c
===================================================================
--- mplayerxp/postproc/vf_panscan.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_panscan.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -4,17 +4,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 
 #ifdef OSD_SUPPORT
-#include "../libvo/sub.h"
-#include "../libvo/osd.h"
+#include "libvo/sub.h"
+#include "libvo/osd.h"
 #endif
 #include "pp_msg.h"
 

Modified: mplayerxp/postproc/vf_perspective.c
===================================================================
--- mplayerxp/postproc/vf_perspective.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_perspective.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -23,16 +23,16 @@
 #include <assert.h>
 #include <math.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
 #ifdef HAVE_MALLOC
 #include <malloc.h>
 #endif
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "pp_msg.h"
 
 #define SUB_PIXEL_BITS 8

Modified: mplayerxp/postproc/vf_raw.c
===================================================================
--- mplayerxp/postproc/vf_raw.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_raw.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -7,14 +7,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
+#include "osdep/fastmemcpy.h"
+#include "postproc/swscale.h"
 #include "pp_msg.h"
 
 struct vf_priv_s {

Modified: mplayerxp/postproc/vf_rectangle.c
===================================================================
--- mplayerxp/postproc/vf_rectangle.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_rectangle.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -4,7 +4,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "pp_msg.h"
 
 struct vf_priv_s {

Modified: mplayerxp/postproc/vf_rgb2bgr.c
===================================================================
--- mplayerxp/postproc/vf_rgb2bgr.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_rgb2bgr.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -3,13 +3,13 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "libswscale/rgb2rgb.h"
 #include "pp_msg.h"
 

Modified: mplayerxp/postproc/vf_rotate.c
===================================================================
--- mplayerxp/postproc/vf_rotate.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_rotate.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -3,14 +3,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
+#include "osdep/fastmemcpy.h"
+#include "postproc/swscale.h"
 #include "pp_msg.h"
 
 struct vf_priv_s {

Modified: mplayerxp/postproc/vf_scale.c
===================================================================
--- mplayerxp/postproc/vf_scale.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_scale.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -11,7 +11,7 @@
 #include "vf.h"
 
 #include "libvo/video_out.h"
-#include "libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "swscale.h"
 #include "libavutil/log.h"
 #include "vf_scale.h"

Modified: mplayerxp/postproc/vf_smartblur.c
===================================================================
--- mplayerxp/postproc/vf_smartblur.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_smartblur.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
 #ifdef USE_SETLOCALE
 #include <locale.h>
@@ -32,11 +32,11 @@
 #include <malloc.h>
 #endif
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
+#include "osdep/fastmemcpy.h"
+#include "postproc/swscale.h"
 #include "vf_scale.h"
 #include "pp_msg.h"
 

Modified: mplayerxp/postproc/vf_softpulldown.c
===================================================================
--- mplayerxp/postproc/vf_softpulldown.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_softpulldown.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -2,14 +2,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../libvo/sub.h"
+#include "osdep/fastmemcpy.h"
+#include "libvo/sub.h"
 #include "pp_msg.h"
 
 struct vf_priv_s {

Modified: mplayerxp/postproc/vf_swapuv.c
===================================================================
--- mplayerxp/postproc/vf_swapuv.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_swapuv.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -22,16 +22,16 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
 #ifdef HAVE_MALLOC
 #include <malloc.h>
 #endif
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "pp_msg.h"
 
 

Modified: mplayerxp/postproc/vf_test.c
===================================================================
--- mplayerxp/postproc/vf_test.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_test.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -21,13 +21,13 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 #include "swscale.h"
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "pp_msg.h"
 
 //===========================================================================//

Modified: mplayerxp/postproc/vf_unsharp.c
===================================================================
--- mplayerxp/postproc/vf_unsharp.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_unsharp.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -34,10 +34,10 @@
 #include <malloc.h>
 #endif
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "pp_msg.h"
 
 #ifndef MIN

Modified: mplayerxp/postproc/vf_yuy2.c
===================================================================
--- mplayerxp/postproc/vf_yuy2.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_yuy2.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -3,13 +3,13 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "libswscale/rgb2rgb.h"
 #include "vf_scale.h"
 #include "pp_msg.h"

Modified: mplayerxp/postproc/vf_yvu9.c
===================================================================
--- mplayerxp/postproc/vf_yvu9.c	2012-10-29 11:38:55 UTC (rev 244)
+++ mplayerxp/postproc/vf_yvu9.c	2012-10-29 12:34:45 UTC (rev 245)
@@ -3,13 +3,13 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
 
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "osdep/fastmemcpy.h"
 #include "libswscale/rgb2rgb.h"
 #include "pp_msg.h"
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.