# HG changeset patch # User diego # Date 1248001630 0 # Node ID 8a16d8418f64e27d71b6bebbf45d82060f950952 # Parent c0d721961a7f48e827609904f60513f8045d18ce Make WMV3 decoders depend on their VC-1 counterparts. They share so much code that enabling one without the other is pointless. diff -r c0d721961a7f -r 8a16d8418f64 Makefile --- a/Makefile Fri Jul 17 14:21:49 2009 +0000 +++ b/Makefile Sun Jul 19 11:07:10 2009 +0000 @@ -260,8 +260,6 @@ 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