Commit 82a11bd4 authored by astrange's avatar astrange

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12880 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a6d4494d
...@@ -548,7 +548,7 @@ retry: ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment