diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-08-06 12:56:25 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-08-06 12:56:25 +0000 |
| commit | 665507aac2175834c4c82aa6c123eeb45e5095ae (patch) | |
| tree | 9b43a9e7016bf8ef4cde06cd91ae3efa4115280a | |
| parent | 0bd485300e1a8bb0ba95df53da34562816120e31 (diff) | |
| download | ffmpeg-streaming-665507aac2175834c4c82aa6c123eeb45e5095ae.zip ffmpeg-streaming-665507aac2175834c4c82aa6c123eeb45e5095ae.tar.gz | |
Make WMV1 encoder depend on H.263 encoder in configure.
Originally committed as revision 19599 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -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 --- 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 |
