[FFmpeg-cvslog] avcodec/x86/dsputil_init: only use xvid idct for lowres=0

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  1 20:48:38 2013 +0200| [93fc80f8bfb3c6ce146e4cd30915bbd15ca73533] | committer: Carl Eugen Hoyos

avcodec/x86/dsputil_init: only use xvid idct for lowres=0

Fixes crash
Fixes Ticket2714

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b791a0831b0a027e7ba4eb6961cc0180472ac603)

Conflicts:
	libavcodec/x86/dsputil_init.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93fc80f8bfb3c6ce146e4cd30915bbd15ca73533
---

 libavcodec/x86/dsputil_mmx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 738bbd1..96abaf9 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;