[FFmpeg-cvslog] Fix wmv1 encoding if all other msmpeg4-related encoders were disabled.

Carl Eugen Hoyos git at videolan.org
Wed Jul 9 08:52:15 CEST 2014


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

Fix wmv1 encoding if all other msmpeg4-related encoders were disabled.

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

 libavcodec/Makefile  |    1 +
 libavcodec/msmpeg4.h |    1 +
 2 files changed, 2 insertions(+)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b75bcd2..8fbfbfd 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -508,6 +508,7 @@ OBJS-$(CONFIG_WMAVOICE_DECODER)        += wmavoice.o \
                                           celp_filters.o \
                                           acelp_vectors.o acelp_filters.o
 OBJS-$(CONFIG_WMV1_DECODER)            += msmpeg4dec.o msmpeg4.o msmpeg4data.o
+OBJS-$(CONFIG_WMV1_ENCODER)            += msmpeg4enc.o
 OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o wmv2dsp.o \
                                           msmpeg4dec.o msmpeg4.o msmpeg4data.o
 OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o wmv2dsp.o \
diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index 6d00010..db77ce1 100644
--- 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 */



More information about the ffmpeg-cvslog mailing list