[FFmpeg-cvslog] r19533 - in trunk/libavcodec: dsputil.c msmpeg4.c msmpeg4.h ppc/dsputil_ppc.c x86/dsputil_mmx.c

[diego]

Author: diego
Date: Wed Jul 29 11:54:49 2009
New Revision: 19533

Log:
Do not check for both CONFIG_VC1_DECODER and CONFIG_WMV3_DECODER,
the former depends upon the latter.

Modified:
   trunk/libavcodec/dsputil.c
   trunk/libavcodec/msmpeg4.c
   trunk/libavcodec/msmpeg4.h
   trunk/libavcodec/ppc/dsputil_ppc.c
   trunk/libavcodec/x86/dsputil_mmx.c

Modified: trunk/libavcodec/dsputil.c
==============================================================================
--- trunk/libavcodec/dsputil.c	Wed Jul 29 11:54:00 2009	(r19532)
+++ trunk/libavcodec/dsputil.c	Wed Jul 29 11:54:49 2009	(r19533)
@@ -2756,7 +2756,7 @@ void ff_avg_cavs_qpel16_mc00_c(uint8_t *
 
 void ff_mlp_init(DSPContext* c, AVCodecContext *avctx);
 
-#if CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
+#if CONFIG_VC1_DECODER
 /* VC-1 specific */
 void ff_vc1dsp_init(DSPContext* c, AVCodecContext *avctx);
 
@@ -2766,7 +2766,7 @@ void ff_put_vc1_mspel_mc00_c(uint8_t *ds
 void ff_avg_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) {
     avg_pixels8_c(dst, src, stride, 8);
 }
-#endif /* CONFIG_VC1_DECODER||CONFIG_WMV3_DECODER */
+#endif /* CONFIG_VC1_DECODER */
 
 void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx);
 
@@ -4548,10 +4548,10 @@ void dsputil_init(DSPContext* c, AVCodec
 #if CONFIG_MLP_DECODER || CONFIG_TRUEHD_DECODER
     ff_mlp_init(c, avctx);
 #endif
-#if CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
+#if CONFIG_VC1_DECODER
     ff_vc1dsp_init(c,avctx);
 #endif
-#if CONFIG_WMV2_DECODER || CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
+#if CONFIG_WMV2_DECODER || CONFIG_VC1_DECODER
     ff_intrax8dsp_init(c,avctx);
 #endif
 #if CONFIG_RV30_DECODER

Modified: trunk/libavcodec/msmpeg4.c
==============================================================================
--- trunk/libavcodec/msmpeg4.c	Wed Jul 29 11:54:00 2009	(r19532)
+++ trunk/libavcodec/msmpeg4.c	Wed Jul 29 11:54:49 2009	(r19533)
@@ -109,7 +109,7 @@ static av_cold void common_init(MpegEncC
         s->y_dc_scale_table= wmv1_y_dc_scale_table;
         s->c_dc_scale_table= wmv1_c_dc_scale_table;
         break;
-#if CONFIG_WMV3_DECODER || CONFIG_VC1_DECODER
+#if CONFIG_VC1_DECODER
     case 6:
         s->y_dc_scale_table= wmv3_dc_scale_table;
         s->c_dc_scale_table= wmv3_dc_scale_table;

Modified: trunk/libavcodec/msmpeg4.h
==============================================================================
--- trunk/libavcodec/msmpeg4.h	Wed Jul 29 11:54:00 2009	(r19532)
+++ trunk/libavcodec/msmpeg4.h	Wed Jul 29 11:54:49 2009	(r19533)
@@ -53,8 +53,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s,
                                 CONFIG_MSMPEG4V2_DECODER || \
                                 CONFIG_MSMPEG4V3_DECODER || \
                                 CONFIG_WMV2_DECODER      || \
-                                CONFIG_VC1_DECODER       || \
-                                CONFIG_WMV3_DECODER)
+                                CONFIG_VC1_DECODER)
 #define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V1_ENCODER || \
                                 CONFIG_MSMPEG4V2_ENCODER || \
                                 CONFIG_MSMPEG4V3_ENCODER || \

Modified: trunk/libavcodec/ppc/dsputil_ppc.c
==============================================================================
--- trunk/libavcodec/ppc/dsputil_ppc.c	Wed Jul 29 11:54:00 2009	(r19532)
+++ trunk/libavcodec/ppc/dsputil_ppc.c	Wed Jul 29 11:54:49 2009	(r19533)
@@ -268,7 +268,7 @@ void dsputil_init_ppc(DSPContext* c, AVC
         mm_flags |= FF_MM_ALTIVEC;
 
         dsputil_init_altivec(c, avctx);
-        if(CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER)
+        if(CONFIG_VC1_DECODER)
             vc1dsp_init_altivec(c, avctx);
         float_init_altivec(c, avctx);
         int_init_altivec(c, avctx);

Modified: trunk/libavcodec/x86/dsputil_mmx.c
==============================================================================
--- trunk/libavcodec/x86/dsputil_mmx.c	Wed Jul 29 11:54:00 2009	(r19532)
+++ trunk/libavcodec/x86/dsputil_mmx.c	Wed Jul 29 11:54:49 2009	(r19533)
@@ -2866,7 +2866,7 @@ void dsputil_init_mmx(DSPContext* c, AVC
             if (CONFIG_CAVS_DECODER)
                 ff_cavsdsp_init_mmx2(c, avctx);
 
-            if (CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER)
+            if (CONFIG_VC1_DECODER)
                 ff_vc1dsp_init_mmx(c, avctx);
 
             c->add_png_paeth_prediction= add_png_paeth_prediction_mmx2;