From ddabdfefa80c29f56b21f8e95c5e6ab38e8fac3a Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 10 Sep 2005 17:09:54 +0000
Subject: [PATCH] select xvid idct for xvid files if possible

Originally committed as revision 4573 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/h263dec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index b51ce5f0c4..87e11794e0 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -636,9 +636,9 @@ retry:
 }
 #endif
 
-#ifdef HAVE_MMX
+#if defined(HAVE_MMX) && defined(CONFIG_GPL)
     if(s->codec_id == CODEC_ID_MPEG4 && s->xvid_build && avctx->idct_algo == FF_IDCT_AUTO && (mm_flags & MM_MMX) && !(s->flags&CODEC_FLAG_BITEXACT)){
-        avctx->idct_algo= FF_IDCT_LIBMPEG2MMX;
+        avctx->idct_algo= FF_IDCT_XVIDMMX;
         avctx->coded_width= 0; // force reinit
     }
 #endif