From d6e7881c2e6000d8bf74b3f68ba0c1bacd8c3688 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 9 Jul 2014 08:51:17 +0200 Subject: Fix wmv1 encoding if all other msmpeg4-related encoders were disabled. --- libavcodec/Makefile | 1 + libavcodec/msmpeg4.h | 1 + 2 files changed, 2 insertions(+) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b75bcd27f9..8fbfbfd22e 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 6d00010a26..db77ce1d73 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 */ -- cgit v1.2.3