Mercurial > libavcodec.hg
comparison dsputil.c @ 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 | d6d7e8d4a04d |
children | 770294452eaf |
comparison
equal
deleted
inserted
replaced
9994:cd2b3ecdb1c9 | 9995:3141f69e3905 |
---|---|
2754 } | 2754 } |
2755 #endif /* CONFIG_CAVS_DECODER */ | 2755 #endif /* CONFIG_CAVS_DECODER */ |
2756 | 2756 |
2757 void ff_mlp_init(DSPContext* c, AVCodecContext *avctx); | 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 /* VC-1 specific */ | 2760 /* VC-1 specific */ |
2761 void ff_vc1dsp_init(DSPContext* c, AVCodecContext *avctx); | 2761 void ff_vc1dsp_init(DSPContext* c, AVCodecContext *avctx); |
2762 | 2762 |
2763 void ff_put_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) { | 2763 void ff_put_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) { |
2764 put_pixels8_c(dst, src, stride, 8); | 2764 put_pixels8_c(dst, src, stride, 8); |
2765 } | 2765 } |
2766 void ff_avg_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) { | 2766 void ff_avg_vc1_mspel_mc00_c(uint8_t *dst, uint8_t *src, int stride, int rnd) { |
2767 avg_pixels8_c(dst, src, stride, 8); | 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 void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx); | 2771 void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx); |
2772 | 2772 |
2773 /* H264 specific */ | 2773 /* H264 specific */ |
2774 void ff_h264dspenc_init(DSPContext* c, AVCodecContext *avctx); | 2774 void ff_h264dspenc_init(DSPContext* c, AVCodecContext *avctx); |
4546 #endif | 4546 #endif |
4547 | 4547 |
4548 #if CONFIG_MLP_DECODER || CONFIG_TRUEHD_DECODER | 4548 #if CONFIG_MLP_DECODER || CONFIG_TRUEHD_DECODER |
4549 ff_mlp_init(c, avctx); | 4549 ff_mlp_init(c, avctx); |
4550 #endif | 4550 #endif |
4551 #if CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER | 4551 #if CONFIG_VC1_DECODER |
4552 ff_vc1dsp_init(c,avctx); | 4552 ff_vc1dsp_init(c,avctx); |
4553 #endif | 4553 #endif |
4554 #if CONFIG_WMV2_DECODER || CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER | 4554 #if CONFIG_WMV2_DECODER || CONFIG_VC1_DECODER |
4555 ff_intrax8dsp_init(c,avctx); | 4555 ff_intrax8dsp_init(c,avctx); |
4556 #endif | 4556 #endif |
4557 #if CONFIG_RV30_DECODER | 4557 #if CONFIG_RV30_DECODER |
4558 ff_rv30dsp_init(c,avctx); | 4558 ff_rv30dsp_init(c,avctx); |
4559 #endif | 4559 #endif |