[SCM] libav/experimental: also autodetect xvid idct if bitexact is used

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:45:40 UTC 2013


The following commit has been merged in the experimental branch:
commit a2f3431fc45189c971cdc26c9279e64326547f04
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Dec 21 15:51:45 2005 +0000

    also autodetect xvid idct if bitexact is used
    
    Originally committed as revision 4761 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index c977d29..86a7cba 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -637,7 +637,7 @@ retry:
 #endif
 
 #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)){
+    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
 //        dsputil_init(&s->dsp, avctx);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list