summaryrefslogtreecommitdiff
path: root/libavcodec/msmpeg4.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-07-29 09:54:49 +0000
committerDiego Biurrun <diego@biurrun.de>2009-07-29 09:54:49 +0000
commit9be6f0d2f8393100a11c8527c7ba18c1dc2f1450 (patch)
treecbcc3b2049b5c4b48ba3d8919d532f68fc0cfafb /libavcodec/msmpeg4.c
parente0f58e39c45abf4fd830f745d31acc43183ac7e6 (diff)
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/msmpeg4.c')
-rw-r--r--libavcodec/msmpeg4.c2
1 files changed, 1 insertions, 1 deletions
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;