Originally committed as revision 22909 to svn://svn.ffmpeg.org/ffmpeg/trunk
Måns Rullgård authored on 2010/04/19 21:49:51... | ... |
@@ -1238,7 +1238,6 @@ h264_dxva2_hwaccel_deps="dxva2api_h" |
1238 | 1238 |
h264_dxva2_hwaccel_select="dxva2 h264_decoder" |
1239 | 1239 |
h264_vaapi_hwaccel_deps="va_va_h" |
1240 | 1240 |
h264_vaapi_hwaccel_select="vaapi" |
1241 |
-h264_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" |
|
1242 | 1241 |
h264_vdpau_decoder_select="vdpau h264_decoder" |
1243 | 1242 |
imc_decoder_select="fft mdct" |
1244 | 1243 |
jpegls_decoder_select="golomb" |
... | ... |
@@ -1251,15 +1250,12 @@ mpeg1video_encoder_select="aandct" |
1251 | 1251 |
mpeg2video_encoder_select="aandct" |
1252 | 1252 |
mpeg4_decoder_select="h263_decoder mpeg4video_parser" |
1253 | 1253 |
mpeg4_encoder_select="h263_encoder" |
1254 |
-mpeg_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" |
|
1255 | 1254 |
mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder" |
1256 |
-mpeg1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" |
|
1257 | 1255 |
mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder" |
1258 | 1256 |
mpeg2_vaapi_hwaccel_deps="va_va_h" |
1259 | 1257 |
mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" |
1260 | 1258 |
mpeg4_vaapi_hwaccel_deps="va_va_h" |
1261 | 1259 |
mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder" |
1262 |
-mpeg4_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" |
|
1263 | 1260 |
mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder" |
1264 | 1261 |
mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" |
1265 | 1262 |
mpeg_xvmc_decoder_select="mpegvideo_decoder" |
... | ... |
@@ -1302,7 +1298,6 @@ vc1_dxva2_hwaccel_deps="dxva2api_h DXVA_PictureParameters_wDecodedPictureIndex" |
1302 | 1302 |
vc1_dxva2_hwaccel_select="dxva2 vc1_decoder" |
1303 | 1303 |
vc1_vaapi_hwaccel_deps="va_va_h" |
1304 | 1304 |
vc1_vaapi_hwaccel_select="vaapi vc1_decoder" |
1305 |
-vc1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" |
|
1306 | 1305 |
vc1_vdpau_decoder_select="vdpau vc1_decoder" |
1307 | 1306 |
vorbis_decoder_select="mdct" |
1308 | 1307 |
vorbis_encoder_select="mdct" |
... | ... |
@@ -1327,6 +1322,8 @@ zlib_encoder_select="zlib" |
1327 | 1327 |
zmbv_decoder_select="zlib" |
1328 | 1328 |
zmbv_encoder_select="zlib" |
1329 | 1329 |
|
1330 |
+vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" |
|
1331 |
+ |
|
1330 | 1332 |
# parsers |
1331 | 1333 |
h264_parser_select="golomb h264dsp" |
1332 | 1334 |
|