summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-09-10 17:09:54 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-09-10 17:09:54 +0000
commitddabdfefa80c29f56b21f8e95c5e6ab38e8fac3a (patch)
tree80e928e857a20a441f06037a2f4dda19d0438ba8 /libavcodec
parent84740d5980fd3249028a3b2381a76f6cd188f454 (diff)
downloadffmpeg-streaming-ddabdfefa80c29f56b21f8e95c5e6ab38e8fac3a.zip
ffmpeg-streaming-ddabdfefa80c29f56b21f8e95c5e6ab38e8fac3a.tar.gz
select xvid idct for xvid files if possible
Originally committed as revision 4573 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h263dec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index b51ce5f..87e1179 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
OpenPOWER on IntegriCloud