diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 20:48:38 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-07-07 18:32:15 +0200 |
| commit | 93fc80f8bfb3c6ce146e4cd30915bbd15ca73533 (patch) | |
| tree | 9e374124fa521ebb0a2a433d366a6e5ae54df23e | |
| parent | e2dcc4452dada1633c54601e8073b1ed84ff4b7e (diff) | |
| download | ffmpeg-93fc80f8bfb3c6ce146e4cd30915bbd15ca73533.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>
(cherry picked from commit b791a0831b0a027e7ba4eb6961cc0180472ac603)
Conflicts:
libavcodec/x86/dsputil_init.c
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 738bbd152b..96abaf90bc 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -2533,7 +2533,7 @@ static void dsputil_init_sse2(DSPContext *c, AVCodecContext *avctx, const int high_bit_depth = bit_depth > 8; #if HAVE_SSE2_INLINE - 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; |