Browse code

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

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

Diego Biurrun authored on 2009/08/07 00:04:59
Showing 2 changed files
... ...
@@ -1133,7 +1133,7 @@ wmav1_encoder_select="fft mdct"
1133 1133
 wmav2_decoder_select="fft mdct"
1134 1134
 wmav2_encoder_select="fft mdct"
1135 1135
 wmv1_encoder_select="h263_encoder"
1136
-wmv2_encoder_select="aandct"
1136
+wmv2_encoder_select="h263_encoder"
1137 1137
 wmv3_decoder_select="vc1_decoder"
1138 1138
 wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
1139 1139
 wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
... ...
@@ -253,7 +253,7 @@ OBJS-$(CONFIG_WMAV2_DECODER)           += wmadec.o wma.o
253 253
 OBJS-$(CONFIG_WMAV2_ENCODER)           += wmaenc.o wma.o
254 254
 OBJS-$(CONFIG_WMV1_DECODER)            += h263dec.o h263.o mpegvideo.o error_resilience.o
255 255
 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
256
-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
256
+OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o msmpeg4.o msmpeg4data.o
257 257
 OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.o
258 258
 OBJS-$(CONFIG_WS_SND1_DECODER)         += ws-snd1.o
259 259
 OBJS-$(CONFIG_XAN_DPCM_DECODER)        += dpcm.o