Merge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 14:37:11 +0000 (15:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 14:37:11 +0000 (15:37 +0100)
* commit '215cdd35efd625ec28ef5846f1692b18f7c2c230':
  configure: Refactor dxva2api.h dependency declarations

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -1802,7 -1619,7 +1802,8 @@@ zmbv_decoder_select="zlib
  zmbv_encoder_select="zlib"
  
  # hardware accelerators
 +crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
+ dxva2_deps="dxva2api_h"
  vaapi_deps="va_va_h"
  vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
  vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
@@@ -1810,32 -1627,24 +1811,32 @@@ vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x
  
  h263_vaapi_hwaccel_select="vaapi h263_decoder"
  h263_vdpau_hwaccel_select="vdpau h263_decoder"
- h264_dxva2_hwaccel_deps="dxva2api_h"
- h264_dxva2_hwaccel_select="dxva2 h264_decoder"
 +h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser"
+ h264_dxva2_hwaccel_deps="dxva2"
+ h264_dxva2_hwaccel_select="h264_decoder"
  h264_vaapi_hwaccel_select="vaapi h264_decoder"
 +h264_vda_decoder_select="vda h264_parser h264_decoder"
 +h264_vda_hwaccel_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
  h264_vda_hwaccel_select="vda h264_decoder"
  h264_vdpau_decoder_select="vdpau h264_decoder"
  h264_vdpau_hwaccel_select="vdpau h264_decoder"
  mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder"
  mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder"
  mpeg1_vdpau_hwaccel_select="vdpau mpeg1video_decoder"
- mpeg2_dxva2_hwaccel_deps="dxva2api_h"
- mpeg2_dxva2_hwaccel_select="dxva2 mpeg2video_decoder"
 +mpeg2_crystalhd_decoder_select="crystalhd"
+ mpeg2_dxva2_hwaccel_deps="dxva2"
+ mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
 +mpeg2_vdpau_hwaccel_select="vdpau mpeg2video_decoder"
  mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder"
  mpeg2_vdpau_hwaccel_select="vdpau mpeg2video_decoder"
 +mpeg4_crystalhd_decoder_select="crystalhd"
  mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder"
  mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder"
  mpeg4_vdpau_hwaccel_select="vdpau mpeg4_decoder"
- vc1_dxva2_hwaccel_deps="dxva2api_h"
- vc1_dxva2_hwaccel_select="dxva2 vc1_decoder"
 +msmpeg4_crystalhd_decoder_select="crystalhd"
 +vc1_crystalhd_decoder_select="crystalhd"
+ vc1_dxva2_hwaccel_deps="dxva2"
+ vc1_dxva2_hwaccel_select="vc1_decoder"
  vc1_vaapi_hwaccel_select="vaapi vc1_decoder"
  vc1_vdpau_decoder_select="vdpau vc1_decoder"
  vc1_vdpau_hwaccel_select="vdpau vc1_decoder"