diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-13 23:56:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-13 23:56:13 +0200 |
| commit | 1294ae6f9409f26cc3df98b93281ed42a5da642b (patch) | |
| tree | 74f2a5807740819c56db47ff9a85f409b4e5b13f | |
| parent | b62e42dafefd489eab551e9de8e69a947f650786 (diff) | |
| download | ffmpeg-1294ae6f9409f26cc3df98b93281ed42a5da642b.tar.gz | |
Revert "Check if dxva2api.h is recent enough to compile vc1_dxva2_hwaccel."
This reverts commit 9104cd5161ec7cb31361f3dabd73a8a813d4f7d0.
Revert requested by ramiro
Conflicts:
configure
| -rwxr-xr-x | configure | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1373,7 +1373,7 @@ tscc_decoder_select="zlib" twinvq_decoder_select="mdct lsp sinewin" vc1_decoder_select="h263_decoder" vc1_crystalhd_decoder_select="crystalhd" -vc1_dxva2_hwaccel_deps="dxva2api_h DXVA_PictureParameters_wDecodedPictureIndex" +vc1_dxva2_hwaccel_deps="dxva2api_h" vc1_dxva2_hwaccel_select="dxva2 vc1_decoder" vc1_vaapi_hwaccel_select="vaapi vc1_decoder" vc1_vdpau_decoder_select="vdpau vc1_decoder" @@ -2865,8 +2865,6 @@ check_header vdpau/vdpau.h check_header vdpau/vdpau_x11.h check_header X11/extensions/XvMClib.h -check_struct dxva2api.h DXVA_PictureParameters wDecodedPictureIndex - disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib |