]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/x86/dsputil_init: only use xvid idct for lowres=0
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jul 2013 18:48:38 +0000 (20:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jul 2013 18:56:37 +0000 (20:56 +0200)
Fixes crash
Fixes Ticket2714

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil_init.c

index 7b49fd623d65463929222cadac9416e1209a0fc7..52d9a6f9fc899af70705adee4106c19618d3b19c 100644 (file)
@@ -621,7 +621,7 @@ static av_cold void dsputil_init_sse2(DSPContext *c, AVCodecContext *avctx,
 #if HAVE_SSE2_INLINE
     const int high_bit_depth = avctx->bits_per_raw_sample > 8;
 
-    if (!high_bit_depth && avctx->idct_algo == FF_IDCT_XVIDMMX) {
+    if (!high_bit_depth && avctx->idct_algo == FF_IDCT_XVIDMMX && avctx->lowres == 0) {
         c->idct_put              = ff_idct_xvid_sse2_put;
         c->idct_add              = ff_idct_xvid_sse2_add;
         c->idct                  = ff_idct_xvid_sse2;