Originally committed as revision 22910 to svn://svn.ffmpeg.org/ffmpeg/trunk
Måns Rullgård authored on 2010/04/19 21:49:53... | ... |
@@ -1229,14 +1229,12 @@ flv_encoder_select="h263_encoder" |
1229 | 1229 |
h261_encoder_select="aandct" |
1230 | 1230 |
h263_decoder_select="h263_parser" |
1231 | 1231 |
h263_encoder_select="aandct" |
1232 |
-h263_vaapi_hwaccel_deps="va_va_h" |
|
1233 | 1232 |
h263_vaapi_hwaccel_select="vaapi h263_decoder" |
1234 | 1233 |
h263i_decoder_select="h263_decoder" |
1235 | 1234 |
h263p_encoder_select="h263_encoder" |
1236 | 1235 |
h264_decoder_select="golomb h264dsp" |
1237 | 1236 |
h264_dxva2_hwaccel_deps="dxva2api_h" |
1238 | 1237 |
h264_dxva2_hwaccel_select="dxva2 h264_decoder" |
1239 |
-h264_vaapi_hwaccel_deps="va_va_h" |
|
1240 | 1238 |
h264_vaapi_hwaccel_select="vaapi" |
1241 | 1239 |
h264_vdpau_decoder_select="vdpau h264_decoder" |
1242 | 1240 |
imc_decoder_select="fft mdct" |
... | ... |
@@ -1252,9 +1250,7 @@ mpeg4_decoder_select="h263_decoder mpeg4video_parser" |
1252 | 1252 |
mpeg4_encoder_select="h263_encoder" |
1253 | 1253 |
mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder" |
1254 | 1254 |
mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder" |
1255 |
-mpeg2_vaapi_hwaccel_deps="va_va_h" |
|
1256 | 1255 |
mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" |
1257 |
-mpeg4_vaapi_hwaccel_deps="va_va_h" |
|
1258 | 1256 |
mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder" |
1259 | 1257 |
mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder" |
1260 | 1258 |
mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" |
... | ... |
@@ -1296,7 +1292,6 @@ twinvq_decoder_select="mdct lsp" |
1296 | 1296 |
vc1_decoder_select="h263_decoder" |
1297 | 1297 |
vc1_dxva2_hwaccel_deps="dxva2api_h DXVA_PictureParameters_wDecodedPictureIndex" |
1298 | 1298 |
vc1_dxva2_hwaccel_select="dxva2 vc1_decoder" |
1299 |
-vc1_vaapi_hwaccel_deps="va_va_h" |
|
1300 | 1299 |
vc1_vaapi_hwaccel_select="vaapi vc1_decoder" |
1301 | 1300 |
vc1_vdpau_decoder_select="vdpau vc1_decoder" |
1302 | 1301 |
vorbis_decoder_select="mdct" |
... | ... |
@@ -1322,6 +1317,7 @@ zlib_encoder_select="zlib" |
1322 | 1322 |
zmbv_decoder_select="zlib" |
1323 | 1323 |
zmbv_encoder_select="zlib" |
1324 | 1324 |
|
1325 |
+vaapi_deps="va_va_h" |
|
1325 | 1326 |
vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" |
1326 | 1327 |
|
1327 | 1328 |
# parsers |