]> git.sesse.net Git - ffmpeg/commitdiff
Xvid IDCTs are not under CONFIG_GPL, so don't require it when using them.
authorAlexander Strange <astrange@ithinksw.com>
Thu, 17 Apr 2008 15:41:25 +0000 (15:41 +0000)
committerAlexander Strange <astrange@ithinksw.com>
Thu, 17 Apr 2008 15:41:25 +0000 (15:41 +0000)
Originally committed as revision 12880 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h263dec.c

index 86a577b63bba8a940dd2ad631cb2072dcd20c157..700ff8fb850f22461de625a2a9efda3053c7553b 100644 (file)
@@ -548,7 +548,7 @@ retry:
 }
 #endif
 
 }
 #endif
 
-#if defined(HAVE_MMX) && defined(CONFIG_GPL)
+#if defined(HAVE_MMX)
     if(s->codec_id == CODEC_ID_MPEG4 && s->xvid_build && avctx->idct_algo == FF_IDCT_AUTO && (mm_flags & MM_MMX)){
         avctx->idct_algo= FF_IDCT_XVIDMMX;
         avctx->coded_width= 0; // force reinit
     if(s->codec_id == CODEC_ID_MPEG4 && s->xvid_build && avctx->idct_algo == FF_IDCT_AUTO && (mm_flags & MM_MMX)){
         avctx->idct_algo= FF_IDCT_XVIDMMX;
         avctx->coded_width= 0; // force reinit