diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 15:38:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:21:52 +0200 |
| commit | f54e01c24e03a7dc340bd9449debfe7fb58987da (patch) | |
| tree | 2deebee8ec6d0cf34cbe02bce336229323df4b42 /libavcodec/mpeg4videodec.c | |
| parent | ad99837b638f1271da37dbe75d409b1350ad556e (diff) | |
| parent | a786c8259dafeca9744252230b5d78f67810770c (diff) | |
| download | ffmpeg-f54e01c24e03a7dc340bd9449debfe7fb58987da.tar.gz | |
Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'
* commit 'a786c8259dafeca9744252230b5d78f67810770c':
idct: Split off Xvid IDCT
Conflicts:
libavcodec/Makefile
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/idctdsp_init.c
This split is somewhat restructured leaving the xvid IDCT available
outside mpeg4 if manually selected.
The code also could not be merged unchanged as it conflicted with a
bugfix in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 41a2ff992f..6ff9aaf361 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -31,6 +31,7 @@ #include "mpeg4video.h" #include "h263.h" #include "thread.h" +#include "xvididct.h" /* The defines below define the number of bits that are read at once for * reading vlc values. Changing these may improve speed and data cache needs @@ -2209,7 +2210,8 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx) ctx->divx_version, ctx->divx_build, s->divx_packed ? "p" : ""); #if HAVE_MMX - if (s->codec_id == AV_CODEC_ID_MPEG4 && ctx->xvid_build >= 0 && + 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_XVIDMMX; @@ -2217,6 +2219,7 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx) return 1; } #endif + return 0; } |