Fix wmv1 encoding if all other msmpeg4-related encoders were disabled.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 9 Jul 2014 06:51:17 +0000 (08:51 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 9 Jul 2014 06:51:17 +0000 (08:51 +0200)
libavcodec/Makefile
libavcodec/msmpeg4.h

index b75bcd2..8fbfbfd 100644 (file)
@@ -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 \
index 6d00010..db77ce1 100644 (file)
@@ -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 */