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 /libavcodec/dsputil.c | |
| parent | e0f58e39c45abf4fd830f745d31acc43183ac7e6 (diff) | |
| download | ffmpeg-9be6f0d2f8393100a11c8527c7ba18c1dc2f1450.tar.gz | |
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
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 8 |
1 files changed, 4 insertions, 4 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 |