Make WMV1 encoder depend on H.263 encoder in configure.

Originally committed as revision 19599 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index af9881e..b81a3f5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1132,7 +1132,7 @@ wmav1_decoder_select="fft mdct"
 wmav1_encoder_select="fft mdct"
 wmav2_decoder_select="fft mdct"
 wmav2_encoder_select="fft mdct"
-wmv1_encoder_select="aandct"
+wmv1_encoder_select="h263_encoder"
 wmv2_encoder_select="aandct"
 wmv3_decoder_select="vc1_decoder"
 wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 6ab4fd8..af2e5e6 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -253,7 +253,6 @@ OBJS-$(CONFIG_WMAV1_ENCODER)           += wmaenc.o wma.o
 OBJS-$(CONFIG_WMAV2_DECODER)           += wmadec.o wma.o
 OBJS-$(CONFIG_WMAV2_ENCODER)           += wmaenc.o wma.o
 OBJS-$(CONFIG_WMV1_DECODER)            += h263dec.o h263.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_WMV1_ENCODER)            += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o msmpeg4.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.o