Merge commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 13:58:06 +0000 (14:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 13:58:06 +0000 (14:58 +0100)
* commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a':
  configure: Simplify VDA header and extralibs check

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -1789,9 -1606,9 +1789,10 @@@ zmbv_decoder_select="zlib
  zmbv_encoder_select="zlib"
  
  # hardware accelerators
 +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,9 -3435,9 +3780,10 @@@ check_header termios.
  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
  
  disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
  disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib