[SCM] libav/experimental: remove superfluous CONFIG_ENCODERS (entire function is already wrapped)

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


The following commit has been merged in the experimental branch:
commit 6f921f3100d7bb4f84719a5b34a7af144fbeff5f
Author: Mike Melanson <mike at multimedia.cx>
Date:   Tue Apr 19 04:29:11 2005 +0000

    remove superfluous CONFIG_ENCODERS (entire function is already wrapped)
    
    Originally committed as revision 4139 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 36bb267..336cf14 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -241,7 +241,7 @@ int DCT_common_init(MpegEncContext *s)
 #ifdef CONFIG_ENCODERS
     s->dct_quantize= dct_quantize_c;
     s->denoise_dct= denoise_dct_c;
-#endif
+#endif //CONFIG_ENCODERS
         
 #ifdef HAVE_MMX
     MPV_common_init_mmx(s);
@@ -1255,7 +1255,6 @@ int MPV_encode_init(AVCodecContext *avctx)
     ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp);
     ff_set_cmp(&s->dsp, s->dsp.frame_skip_cmp, s->avctx->frame_skip_cmp);
     
-#ifdef CONFIG_ENCODERS
     if (s->out_format == FMT_H261)
         ff_h261_encode_init(s);
     if (s->out_format == FMT_H263)
@@ -1264,7 +1263,6 @@ int MPV_encode_init(AVCodecContext *avctx)
         ff_msmpeg4_encode_init(s);
     if (s->out_format == FMT_MPEG1)
         ff_mpeg1_encode_init(s);
-#endif
 
     /* init q matrix */
     for(i=0;i<64;i++) {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list