diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
| commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
| tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /libmpcodecs/vd_libmpeg2.c | |
| parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
| parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
| download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz | |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'libmpcodecs/vd_libmpeg2.c')
| -rw-r--r-- | libmpcodecs/vd_libmpeg2.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c index eeab4b23be..7505768dee 100644 --- a/libmpcodecs/vd_libmpeg2.c +++ b/libmpcodecs/vd_libmpeg2.c @@ -83,9 +83,7 @@ static int init(sh_video_t *sh){ #elif ARCH_ARM accel |= MPEG2_ACCEL_ARM; #endif - #ifdef HAVE_IWMMXT - accel |= MPEG2_ACCEL_ARM_IWMMXT; - #elif HAVE_MVI + #ifdef HAVE_MVI accel |= MPEG2_ACCEL_ALPHA_MVI; #elif HAVE_VIS accel |= MPEG2_ACCEL_SPARC_VIS; |