aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-02-21 12:31:15 +0100
committerDiego Biurrun <diego@biurrun.de>2013-02-23 20:13:48 +0100
commit9840130edf3a969ec06dd0faa61dcf8d90c5f67a (patch)
treee05424b55f14e446c9429effa8130c041b8ff6b8
parent0a8da1a3e5f0b9329dfb89d17356ff5444c02351 (diff)
downloadffmpeg-9840130edf3a969ec06dd0faa61dcf8d90c5f67a.tar.gz
configure: Simplify VDA header and extralibs check
-rwxr-xr-xconfigure7
1 files changed, 2 insertions, 5 deletions
diff --git a/configure b/configure
index b6f9f3acaf..a9b0cddb4e 100755
--- a/configure
+++ b/configure
@@ -1608,6 +1608,7 @@ zmbv_encoder_select="zlib"
# hardware accelerators
vaapi_deps="va_va_h"
vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
+vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
h263_vaapi_hwaccel_select="vaapi h263_decoder"
@@ -3434,6 +3435,7 @@ check_header sys/time.h
check_header unistd.h
check_header vdpau/vdpau.h
check_header vdpau/vdpau_x11.h
+check_header VideoDecodeAcceleration/VDADecoder.h
check_header windows.h
check_header X11/extensions/XvMClib.h
@@ -3586,11 +3588,6 @@ require X11 X11/Xlib.h XOpenDisplay -lX11 &&
require Xext X11/extensions/XShm.h XShmCreateImage -lXext &&
require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes
-# check for VDA header
-if ! disabled vda && check_header VideoDecodeAcceleration/VDADecoder.h; then
- enable vda && add_extralibs -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore
-fi
-
if ! disabled vdpau && enabled vdpau_vdpau_h; then
check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" ||
{ echolog "Please upgrade to libvdpau >= 0.2 if you would like vdpau support." && disable vdpau; }