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/idctdsp.c | |
| parent | ad99837b638f1271da37dbe75d409b1350ad556e (diff) | |
| parent | a786c8259dafeca9744252230b5d78f67810770c (diff) | |
| download | ffmpeg-streaming-f54e01c24e03a7dc340bd9449debfe7fb58987da.zip ffmpeg-streaming-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/idctdsp.c')
| -rw-r--r-- | libavcodec/idctdsp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index e91ba2e6..1c7a2aa 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -24,6 +24,7 @@ #include "faanidct.h" #include "idctdsp.h" #include "simple_idct.h" +#include "xvididct.h" av_cold void ff_init_scantable(uint8_t *permutation, ScanTable *st, const uint8_t *src_scantable) @@ -299,6 +300,9 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx) c->put_signed_pixels_clamped = put_signed_pixels_clamped_c; c->add_pixels_clamped = add_pixels_clamped_c; + if (CONFIG_MPEG4_DECODER && avctx->idct_algo == FF_IDCT_XVIDMMX) + ff_xvididct_init(c, avctx); + if (ARCH_ALPHA) ff_idctdsp_init_alpha(c, avctx, high_bit_depth); if (ARCH_ARM) |
