diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:58:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:58:06 +0100 |
| commit | 56c245f9219b26c60f1c4563300f73d5cc3464a7 (patch) | |
| tree | 6b9ea9a4b60d31b96d9cd8b7486b49a534837daa | |
| parent | 74c92452541bc50e1835ba5370c0a5c56b164232 (diff) | |
| parent | 9840130edf3a969ec06dd0faa61dcf8d90c5f67a (diff) | |
| download | ffmpeg-56c245f9219b26c60f1c4563300f73d5cc3464a7.tar.gz | |
Merge commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a'
* commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a':
configure: Simplify VDA header and extralibs check
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -1792,6 +1792,7 @@ zmbv_encoder_select="zlib" crystalhd_deps="libcrystalhd_libcrystalhd_if_h" 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" @@ -3779,6 +3780,7 @@ check_header termios.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 check_header asm/types.h @@ -3786,14 +3788,6 @@ check_header asm/types.h disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib -# check for VDA header -if ! disabled vda && ! enabled ppc; then - if check_header VideoDecodeAcceleration/VDADecoder.h; then - enable vda - add_extralibs -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore - fi -fi - if ! disabled w32threads && ! enabled pthreads; then check_func_headers "windows.h process.h" _beginthreadex && enable w32threads fi |