diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-07-19 11:07:10 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-07-19 11:07:10 +0000 |
| commit | 015f8ee009858fe773ec7648039fbc243fdfd6cf (patch) | |
| tree | 0e34dcafcd16e90bddee2ed8ccd6184db201127b | |
| parent | 6fec122af7934ba9efee83f60b94a27929673407 (diff) | |
| download | ffmpeg-015f8ee009858fe773ec7648039fbc243fdfd6cf.tar.gz | |
Make WMV3 decoders depend on their VC-1 counterparts.
They share so much code that enabling one without the other is pointless.
Originally committed as revision 19466 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 |
2 files changed, 3 insertions, 6 deletions
@@ -1123,10 +1123,9 @@ wmav2_decoder_select="fft mdct" wmav2_encoder_select="fft mdct" wmv1_encoder_select="aandct" wmv2_encoder_select="aandct" -wmv3_vaapi_hwaccel_deps="va_va_h" -wmv3_vaapi_hwaccel_select="vaapi wmv3_decoder" -wmv3_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" -wmv3_vdpau_decoder_select="vdpau wmv3_decoder" +wmv3_decoder_select="vc1_decoder" +wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel" +wmv3_vdpau_decoder_select="vc1_vdpau_decoder" zlib_decoder_select="zlib" zlib_encoder_select="zlib" zmbv_decoder_select="zlib" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a37609e607..4b4440f463 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -260,8 +260,6 @@ OBJS-$(CONFIG_WMV1_DECODER) += h263dec.o h263.o mpeg12data.o mpegvide 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 mpeg12data.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_WMV3_DECODER) += vc1dec.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o -OBJS-$(CONFIG_WMV3_VAAPI_HWACCEL) += vaapi_vc1.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o |