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 /libmpeg2/cpu_accel.c | |
| 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 'libmpeg2/cpu_accel.c')
| -rw-r--r-- | libmpeg2/cpu_accel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpeg2/cpu_accel.c b/libmpeg2/cpu_accel.c index 66f7b7fdff..587cf32ad3 100644 --- a/libmpeg2/cpu_accel.c +++ b/libmpeg2/cpu_accel.c @@ -41,11 +41,11 @@ * instructions via assembly. However, it is regarded as duplicated work * in MPlayer, so that we enforce using MPlayer's implementation. */ -#define USE_MPLAYER_CPUDETECT +#define MPLAYER_CPUDETECT static inline uint32_t arch_accel (void) { -#if !defined(USE_MPLAYER_CPUDETECT) +#if !defined(MPLAYER_CPUDETECT) uint32_t eax, ebx, ecx, edx; int AMD; uint32_t caps; @@ -120,7 +120,7 @@ static inline uint32_t arch_accel (void) caps |= MPEG2_ACCEL_X86_MMXEXT; return caps; -#else /* USE_MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */ +#else /* MPLAYER_CPUDETECT: Use MPlayer's CPU capability property. */ caps = 0; if (gCpuCaps.hasMMX) caps |= MPEG2_ACCEL_X86_MMX; @@ -133,7 +133,7 @@ static inline uint32_t arch_accel (void) return caps; -#endif /* USE_MPLAYER_CPUDETECT */ +#endif /* MPLAYER_CPUDETECT */ } #endif /* ARCH_X86 || ARCH_X86_64 */ |