Originally committed as revision 19466 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diego Biurrun authored on 2009/07/19 20:07:10... | ... |
@@ -1123,10 +1123,9 @@ wmav2_decoder_select="fft mdct" |
1123 | 1123 |
wmav2_encoder_select="fft mdct" |
1124 | 1124 |
wmv1_encoder_select="aandct" |
1125 | 1125 |
wmv2_encoder_select="aandct" |
1126 |
-wmv3_vaapi_hwaccel_deps="va_va_h" |
|
1127 |
-wmv3_vaapi_hwaccel_select="vaapi wmv3_decoder" |
|
1128 |
-wmv3_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" |
|
1129 |
-wmv3_vdpau_decoder_select="vdpau wmv3_decoder" |
|
1126 |
+wmv3_decoder_select="vc1_decoder" |
|
1127 |
+wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel" |
|
1128 |
+wmv3_vdpau_decoder_select="vc1_vdpau_decoder" |
|
1130 | 1129 |
zlib_decoder_select="zlib" |
1131 | 1130 |
zlib_encoder_select="zlib" |
1132 | 1131 |
zmbv_decoder_select="zlib" |
... | ... |
@@ -260,8 +260,6 @@ OBJS-$(CONFIG_WMV1_DECODER) += h263dec.o h263.o mpeg12data.o mpegvide |
260 | 260 |
OBJS-$(CONFIG_WMV1_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o |
261 | 261 |
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 |
262 | 262 |
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 |
263 |
-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 |
|
264 |
-OBJS-$(CONFIG_WMV3_VAAPI_HWACCEL) += vaapi_vc1.o |
|
265 | 263 |
OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o |
266 | 264 |
OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o |
267 | 265 |
OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o |