diff options
| author | Alexander Strange <astrange@ithinksw.com> | 2008-04-17 15:41:25 +0000 |
|---|---|---|
| committer | Alexander Strange <astrange@ithinksw.com> | 2008-04-17 15:41:25 +0000 |
| commit | f1ae14d20d6b25ed8e1c2b8882b99df71ad84b1a (patch) | |
| tree | 1b3e6feaafbfbbd5cf03dbeab7769850659dbdc7 /libavcodec/h263dec.c | |
| parent | 1beb670a2d63da271cb259c12dffb85903a14ed2 (diff) | |
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
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 86a577b63b..700ff8fb85 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -548,7 +548,7 @@ retry: } #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 |