Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'

[ffmpeg] / libavcodec / msmpeg4.h

diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index 6d00010a2652b9bcf1b68a669db1d20129964f95..db77ce1d73043807dce76c35e04cf7db216574ad 100644 (file)
--- a/libavcodec/msmpeg4.h
+++ b/libavcodec/msmpeg4.h
@@ -64,6 +64,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
                                 CONFIG_VC1_DECODER)
 #define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V2_ENCODER || \
                                 CONFIG_MSMPEG4V3_ENCODER || \
+                                CONFIG_WMV1_ENCODER      || \
                                 CONFIG_WMV2_ENCODER)
 
 #endif /* AVCODEC_MSMPEG4_H */