Xvid IDCTs are not under CONFIG_GPL, so don't require it when using them.

Originally committed as revision 12880 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alexander Strange 2008-04-17 15:41:25 +00:00
parent 1beb670a2d
commit f1ae14d20d

View 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)){ 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->idct_algo= FF_IDCT_XVIDMMX;
avctx->coded_width= 0; // force reinit avctx->coded_width= 0; // force reinit