Revision 9be6f0d2

View differences:

libavcodec/dsputil.c
2756 2756

  
2757 2757
void ff_mlp_init(DSPContext* c, AVCodecContext *avctx);
2758 2758

  
2759
#if CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
2759
#if CONFIG_VC1_DECODER
2760 2760
/* VC-1 specific */
2761 2761
void ff_vc1dsp_init(DSPContext* c, AVCodecContext *avctx);
2762 2762

  
......
2766 2766
void ff_avg_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) {
2767 2767
    avg_pixels8_c(dst, src, stride, 8);
2768 2768
}
2769
#endif /* CONFIG_VC1_DECODER||CONFIG_WMV3_DECODER */
2769
#endif /* CONFIG_VC1_DECODER */
2770 2770

  
2771 2771
void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx);
2772 2772

  
......
4548 4548
#if CONFIG_MLP_DECODER || CONFIG_TRUEHD_DECODER
4549 4549
    ff_mlp_init(c, avctx);
4550 4550
#endif
4551
#if CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
4551
#if CONFIG_VC1_DECODER
4552 4552
    ff_vc1dsp_init(c,avctx);
4553 4553
#endif
4554
#if CONFIG_WMV2_DECODER || CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
4554
#if CONFIG_WMV2_DECODER || CONFIG_VC1_DECODER
4555 4555
    ff_intrax8dsp_init(c,avctx);
4556 4556
#endif
4557 4557
#if CONFIG_RV30_DECODER
libavcodec/msmpeg4.c
109 109
        s->y_dc_scale_table= wmv1_y_dc_scale_table;
110 110
        s->c_dc_scale_table= wmv1_c_dc_scale_table;
111 111
        break;
112
#if CONFIG_WMV3_DECODER || CONFIG_VC1_DECODER
112
#if CONFIG_VC1_DECODER
113 113
    case 6:
114 114
        s->y_dc_scale_table= wmv3_dc_scale_table;
115 115
        s->c_dc_scale_table= wmv3_dc_scale_table;
libavcodec/msmpeg4.h
53 53
                                CONFIG_MSMPEG4V2_DECODER || \
54 54
                                CONFIG_MSMPEG4V3_DECODER || \
55 55
                                CONFIG_WMV2_DECODER      || \
56
                                CONFIG_VC1_DECODER       || \
57
                                CONFIG_WMV3_DECODER)
56
                                CONFIG_VC1_DECODER)
58 57
#define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V1_ENCODER || \
59 58
                                CONFIG_MSMPEG4V2_ENCODER || \
60 59
                                CONFIG_MSMPEG4V3_ENCODER || \
libavcodec/ppc/dsputil_ppc.c
268 268
        mm_flags |= FF_MM_ALTIVEC;
269 269

  
270 270
        dsputil_init_altivec(c, avctx);
271
        if(CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER)
271
        if(CONFIG_VC1_DECODER)
272 272
            vc1dsp_init_altivec(c, avctx);
273 273
        float_init_altivec(c, avctx);
274 274
        int_init_altivec(c, avctx);
libavcodec/x86/dsputil_mmx.c
2866 2866
            if (CONFIG_CAVS_DECODER)
2867 2867
                ff_cavsdsp_init_mmx2(c, avctx);
2868 2868

  
2869
            if (CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER)
2869
            if (CONFIG_VC1_DECODER)
2870 2870
                ff_vc1dsp_init_mmx(c, avctx);
2871 2871

  
2872 2872
            c->add_png_paeth_prediction= add_png_paeth_prediction_mmx2;

Also available in: Unified diff