[FFmpeg-cvslog] Revert "Check if dxva2api.h is recent enough to compile vc1_dxva2_hwaccel."
Michael Niedermayer
git at videolan.org
Wed Sep 14 00:40:32 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 13 23:56:13 2011 +0200| [1294ae6f9409f26cc3df98b93281ed42a5da642b] | committer: Michael Niedermayer
Revert "Check if dxva2api.h is recent enough to compile vc1_dxva2_hwaccel."
This reverts commit 9104cd5161ec7cb31361f3dabd73a8a813d4f7d0.
Revert requested by ramiro
Conflicts:
configure
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1294ae6f9409f26cc3df98b93281ed42a5da642b
---
configure | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 300852d..1498cf2 100755
--- a/configure
+++ b/configure
@@ -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
More information about the ffmpeg-cvslog
mailing list