diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-08-06 15:04:59 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-08-06 15:04:59 +0000 |
| commit | 1746e2a9368f7a3133c675a72883cf05efa99c72 (patch) | |
| tree | 1dd9e2782c3e8741ae76d244bd6cef805a46fb7b | |
| parent | c37de5e19480bf36c5c7a08f94aca61e472cab4f (diff) | |
| download | ffmpeg-1746e2a9368f7a3133c675a72883cf05efa99c72.tar.gz | |
Make WMV2 encoder depend on H.263 encoder in configure.
Originally committed as revision 19601 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1133,7 +1133,7 @@ wmav1_encoder_select="fft mdct" wmav2_decoder_select="fft mdct" wmav2_encoder_select="fft mdct" wmv1_encoder_select="h263_encoder" -wmv2_encoder_select="aandct" +wmv2_encoder_select="h263_encoder" wmv3_decoder_select="vc1_decoder" wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel" wmv3_vdpau_decoder_select="vc1_vdpau_decoder" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0cae8efabe..9893dc75d0 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -253,7 +253,7 @@ 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_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_WMV2_ENCODER) += wmv2enc.o wmv2.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o |