From 9be6f0d2f8393100a11c8527c7ba18c1dc2f1450 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 29 Jul 2009 09:54:49 +0000 Subject: 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 --- libavcodec/msmpeg4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/msmpeg4.c') 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; -- cgit v1.2.1