diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
| commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
| tree | b09b4c45898be2754f156ebba16fa1054f42788d /libvo/fastmemcpy.h | |
| parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
| parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
| download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz | |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'libvo/fastmemcpy.h')
| -rw-r--r-- | libvo/fastmemcpy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index 84d05e2c27..3ac32e3a71 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -23,7 +23,7 @@ #include <inttypes.h> #include <string.h> -#ifdef USE_FASTMEMCPY +#ifdef CONFIG_FASTMEMCPY #if defined(HAVE_MMX) || defined(HAVE_MMX2) || defined(HAVE_3DNOW) \ /* || defined(HAVE_SSE) || defined(HAVE_SSE2) */ #include <stddef.h> @@ -36,7 +36,7 @@ extern void * mem2agpcpy(void * to, const void * from, size_t len); #define fast_memcpy(a,b,c) memcpy(a,b,c) #endif -#else /* USE_FASTMEMCPY */ +#else /* CONFIG_FASTMEMCPY */ #define mem2agpcpy(a,b,c) memcpy(a,b,c) #define fast_memcpy(a,b,c) memcpy(a,b,c) #endif |