diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 05:18:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 05:19:06 +0200 |
| commit | 50841da1433126b02c7dc0cc39cf1ee718509be6 (patch) | |
| tree | e85e5dcd239f0dc4b87baad6944a2fedf812db68 | |
| parent | feac9cbed0602503e9100dd2257ddc0d46e1929d (diff) | |
| download | ffmpeg-50841da1433126b02c7dc0cc39cf1ee718509be6.tar.gz | |
avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 5 |
1 files changed, 1 insertions, 4 deletions
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; } |