[FFmpeg-cvslog] configure: check for recent dxva2api headers with fixed COBJMACROS defines

Hendrik Leppkes git at videolan.org
Fri May 9 14:44:19 CEST 2014


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri May  9 13:53:52 2014 +0200| [bc47801968fc20369e5794e5d403faf23a98d190] | committer: Michael Niedermayer

configure: check for recent dxva2api headers with fixed COBJMACROS defines

This fixes build failures on older mingw chains (before 2012).

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc47801968fc20369e5794e5d403faf23a98d190
---

 configure |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index e5ff72b..34b161e 100755
--- a/configure
+++ b/configure
@@ -1762,6 +1762,7 @@ HAVE_LIST="
     $TYPES_LIST
     atomics_native
     dos_paths
+    dxva2api_cobj
     dxva2_lib
     libc_msvcrt
     libdc1394_1
@@ -4802,6 +4803,16 @@ require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes &&
 
 check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs"
 
+enabled dxva2api_h &&
+    check_cc <<EOF && enable dxva2api_cobj
+#define _WIN32_WINNT 0x0600
+#define COBJMACROS
+#include <windows.h>
+#include <d3d9.h>
+#include <dxva2api.h>
+int main(void) { IDirectXVideoDecoder *o = NULL; IDirectXVideoDecoder_Release(o); return 0; }
+EOF
+
 enabled vaapi &&
     check_lib va/va.h vaInitialize -lva ||
     disable vaapi
@@ -5046,7 +5057,7 @@ if test $target_os = "haiku"; then
     disable posix_memalign
 fi
 
-enabled_all dxva2 CoTaskMemFree &&
+enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
     prepend ffmpeg_libs $($ldflags_filter "-lole32") &&
     enable dxva2_lib
 



More information about the ffmpeg-cvslog mailing list