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

pull/76/merge
Carl Eugen Hoyos 11 years ago
parent e4dfc3f9b8
commit d6e7881c2e
  1. 1
      libavcodec/Makefile
  2. 1
      libavcodec/msmpeg4.h

@ -508,6 +508,7 @@ OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \
celp_filters.o \ celp_filters.o \
acelp_vectors.o acelp_filters.o acelp_vectors.o acelp_filters.o
OBJS-$(CONFIG_WMV1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.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 \ OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2dsp.o \
msmpeg4dec.o msmpeg4.o msmpeg4data.o msmpeg4dec.o msmpeg4.o msmpeg4data.o
OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2dsp.o \ OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2dsp.o \

@ -64,6 +64,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
CONFIG_VC1_DECODER) CONFIG_VC1_DECODER)
#define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V2_ENCODER || \ #define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V2_ENCODER || \
CONFIG_MSMPEG4V3_ENCODER || \ CONFIG_MSMPEG4V3_ENCODER || \
CONFIG_WMV1_ENCODER || \
CONFIG_WMV2_ENCODER) CONFIG_WMV2_ENCODER)
#endif /* AVCODEC_MSMPEG4_H */ #endif /* AVCODEC_MSMPEG4_H */

Loading…
Cancel
Save