aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravcoder <ffmpeg@gmail.com>2008-12-25 13:26:18 +0000
committerDiego Biurrun <diego@biurrun.de>2008-12-25 13:26:18 +0000
commitbb0bfcd5acc8dbe550d493d049e19404c2b2d9c0 (patch)
tree79336927837e1498d95a103487ee1832b1ee27a1
parent1cca8d24232c9f81d71364c4725b3bc43eab637e (diff)
downloadffmpeg-bb0bfcd5acc8dbe550d493d049e19404c2b2d9c0.tar.gz
The VC-1/WMV3 decoders depend on ENABLE_MSMPEG4_DECODER.
patch by avcoder, ffmpeg gmail com Originally committed as revision 16308 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/msmpeg4.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index 3226015be2..14429592d8 100644
--- a/libavcodec/msmpeg4.h
+++ b/libavcodec/msmpeg4.h
@@ -52,7 +52,9 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
#define ENABLE_MSMPEG4_DECODER (ENABLE_MSMPEG4V1_DECODER || \
ENABLE_MSMPEG4V2_DECODER || \
ENABLE_MSMPEG4V3_DECODER || \
- ENABLE_WMV2_DECODER)
+ ENABLE_WMV2_DECODER || \
+ ENABLE_VC1_DECODER || \
+ ENABLE_WMV3_DECODER)
#define ENABLE_MSMPEG4_ENCODER (ENABLE_MSMPEG4V1_ENCODER || \
ENABLE_MSMPEG4V2_ENCODER || \
ENABLE_MSMPEG4V3_ENCODER || \