diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 03:55:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 04:09:38 +0200 |
| commit | 5b58d79a99658200ee5562999b16b5a8fa729b22 (patch) | |
| tree | bd10ed2708d7485f5156c4e67f8325bcff5bd999 /libavcodec/x86/xvididct_init.c | |
| parent | 5db23c07a3f76d31e8e3178f8bacb68289bba62b (diff) | |
| parent | 7a1d6ddd2c6b2d66fbc1afa584cf506930a26453 (diff) | |
| download | ffmpeg-5b58d79a99658200ee5562999b16b5a8fa729b22.tar.gz | |
Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'
* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
xvid: Add C IDCT
Conflicts:
libavcodec/dct-test.c
libavcodec/xvididct.c
See: 298b3b6c1f8f66b9bc6de53a7b51d3de745d946b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/xvididct_init.c')
| -rw-r--r-- | libavcodec/x86/xvididct_init.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/x86/xvididct_init.c b/libavcodec/x86/xvididct_init.c index be0f700766..8c227844b5 100644 --- a/libavcodec/x86/xvididct_init.c +++ b/libavcodec/x86/xvididct_init.c @@ -26,10 +26,16 @@ #include "idctdsp.h" #include "xvididct.h" -av_cold void ff_xvid_idct_init_x86(IDCTDSPContext *c) +av_cold void ff_xvid_idct_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, + unsigned high_bit_depth) { int cpu_flags = av_get_cpu_flags(); + if (high_bit_depth || + !(avctx->idct_algo == FF_IDCT_AUTO || + avctx->idct_algo == FF_IDCT_XVID)) + return; + if (INLINE_MMX(cpu_flags)) { c->idct_put = ff_xvid_idct_mmx_put; c->idct_add = ff_xvid_idct_mmx_add; |