From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 3 Sep 2014 03:18:09 +0000 (+0200)
Subject: avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86
X-Git-Tag: android-x86-6.0-r1~3281
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=50841da1433126b02c7dc0cc39cf1ee718509be6;p=android-x86%2Fexternal-ffmpeg.git

avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 31bc67bb63..99c7429486 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2209,16 +2209,13 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx)
                s->workaround_bugs, ctx->lavc_build, ctx->xvid_build,
                ctx->divx_version, ctx->divx_build, s->divx_packed ? "p" : "");
 
-#if HAVE_MMX
     if (CONFIG_MPEG4_DECODER && ctx->xvid_build >= 0 &&
         s->codec_id == AV_CODEC_ID_MPEG4 &&
-        avctx->idct_algo == FF_IDCT_AUTO &&
-        (av_get_cpu_flags() & AV_CPU_FLAG_MMX)) {
+        avctx->idct_algo == FF_IDCT_AUTO) {
         avctx->idct_algo = FF_IDCT_XVID;
         ff_mpv_idct_init(s);
         return 1;
     }
-#endif
 
     return 0;
 }