RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-03 05:18:09 +02:00
parent feac9cbed0
commit 50841da143
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpeg4videodec.c
View File

@ -2209,16 +2209,13 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx)
s->workaround_bugs, ctx->lavc_build, ctx->xvid_build, s->workaround_bugs, ctx->lavc_build, ctx->xvid_build,
ctx->divx_version, ctx->divx_build, s->divx_packed ? "p" : ""); ctx->divx_version, ctx->divx_build, s->divx_packed ? "p" : "");
#if HAVE_MMX
if (CONFIG_MPEG4_DECODER && ctx->xvid_build >= 0 && if (CONFIG_MPEG4_DECODER && ctx->xvid_build >= 0 &&
s->codec_id == AV_CODEC_ID_MPEG4 && s->codec_id == AV_CODEC_ID_MPEG4 &&
avctx->idct_algo == FF_IDCT_AUTO && avctx->idct_algo == FF_IDCT_AUTO) {
(av_get_cpu_flags() & AV_CPU_FLAG_MMX)) {
avctx->idct_algo = FF_IDCT_XVID; avctx->idct_algo = FF_IDCT_XVID;
ff_mpv_idct_init(s); ff_mpv_idct_init(s);
return 1; return 1;
} }
#endif
return 0; return 0;
} }