[FFmpeg-cvslog] Fix wmv1 decoding if no other msmpeg4-related decoder was compiled.

Carl Eugen Hoyos git at videolan.org
Wed Jul 9 08:28:18 CEST 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Jul  9 08:27:24 2014 +0200| [e4dfc3f9b88775770f18ce27d80835effe8472db] | committer: Carl Eugen Hoyos

Fix wmv1 decoding if no other msmpeg4-related decoder was compiled.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4dfc3f9b88775770f18ce27d80835effe8472db
---

 libavcodec/msmpeg4.h |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index a723888..6d00010 100644
--- a/libavcodec/msmpeg4.h
+++ b/libavcodec/msmpeg4.h
@@ -59,6 +59,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
 #define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \
                                 CONFIG_MSMPEG4V2_DECODER || \
                                 CONFIG_MSMPEG4V3_DECODER || \
+                                CONFIG_WMV1_DECODER      || \
                                 CONFIG_WMV2_DECODER      || \
                                 CONFIG_VC1_DECODER)
 #define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V2_ENCODER || \



More information about the ffmpeg-cvslog mailing list