aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-01 20:48:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-01 20:56:37 +0200
commitb791a0831b0a027e7ba4eb6961cc0180472ac603 (patch)
treea4e6fab81e68f8fc04d32d9e57d1e885dfd688fa
parent7ebab4159a6960f61b42b89a2efbc6eb3dfc199b (diff)
downloadffmpeg-b791a0831b0a027e7ba4eb6961cc0180472ac603.tar.gz
avcodec/x86/dsputil_init: only use xvid idct for lowres=0
Fixes crash Fixes Ticket2714 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/x86/dsputil_init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c
index 7b49fd623d..52d9a6f9fc 100644
--- a/libavcodec/x86/dsputil_init.c
+++ b/libavcodec/x86/dsputil_init.c
@@ -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;