Mercurial > libavcodec.hg
changeset 9995:3141f69e3905 libavcodec
Do not check for both CONFIG_VC1_DECODER and CONFIG_WMV3_DECODER,
the former depends upon the latter.
| author | diego |
|---|---|
| date | Wed, 29 Jul 2009 09:54:49 +0000 |
| parents | cd2b3ecdb1c9 |
| children | 38a57d201569 |
| files | dsputil.c msmpeg4.c msmpeg4.h ppc/dsputil_ppc.c x86/dsputil_mmx.c |
| diffstat | 5 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/dsputil.c Wed Jul 29 09:54:00 2009 +0000 +++ b/dsputil.c Wed Jul 29 09:54:49 2009 +0000 @@ -2756,7 +2756,7 @@ 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_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 @@ #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
--- a/msmpeg4.c Wed Jul 29 09:54:00 2009 +0000 +++ b/msmpeg4.c Wed Jul 29 09:54:49 2009 +0000 @@ -109,7 +109,7 @@ 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;
--- a/msmpeg4.h Wed Jul 29 09:54:00 2009 +0000 +++ b/msmpeg4.h Wed Jul 29 09:54:49 2009 +0000 @@ -53,8 +53,7 @@ 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 || \
--- a/ppc/dsputil_ppc.c Wed Jul 29 09:54:00 2009 +0000 +++ b/ppc/dsputil_ppc.c Wed Jul 29 09:54:49 2009 +0000 @@ -268,7 +268,7 @@ 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);
--- a/x86/dsputil_mmx.c Wed Jul 29 09:54:00 2009 +0000 +++ b/x86/dsputil_mmx.c Wed Jul 29 09:54:49 2009 +0000 @@ -2866,7 +2866,7 @@ 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;