diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-07-29 09:54:49 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-07-29 09:54:49 +0000 |
| commit | 9be6f0d2f8393100a11c8527c7ba18c1dc2f1450 (patch) | |
| tree | cbcc3b2049b5c4b48ba3d8919d532f68fc0cfafb | |
| parent | e0f58e39c45abf4fd830f745d31acc43183ac7e6 (diff) | |
Do not check for both CONFIG_VC1_DECODER and CONFIG_WMV3_DECODER,
the former depends upon the latter.
Originally committed as revision 19533 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/dsputil.c | 8 | ||||
| -rw-r--r-- | libavcodec/msmpeg4.c | 2 | ||||
| -rw-r--r-- | libavcodec/msmpeg4.h | 3 | ||||
| -rw-r--r-- | libavcodec/ppc/dsputil_ppc.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index ff0a436722..871d1c7563 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2756,7 +2756,7 @@ void ff_avg_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride) { 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 *dst, uint8_t *src, int stride, int rnd) { 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, AVCodecContext *avctx) #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 diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 11d5ea4a0a..2c9fcee02b 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -109,7 +109,7 @@ static av_cold void common_init(MpegEncContext * s) 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; diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index 4a62698c6a..278ed15ee1 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -53,8 +53,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); 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 || \ diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 8846810e1f..63103f8bd1 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -268,7 +268,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) 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); diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index f585f3c5ee..da0f76412b 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -2866,7 +2866,7 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) 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; |