Merge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 14:45:45 +0000 (15:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 15:18:21 +0000 (16:18 +0100)
* commit '82ca17ac7a0a08784cb6808384ee237ac28e8334':
  configure: Fix vaapi/vda/vdpau dependency declarations

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -1809,38 -1625,46 +1809,54 @@@ vda_deps="VideoDecodeAcceleration_VDADe
  vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
  vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
  
- h263_vaapi_hwaccel_select="vaapi h263_decoder"
- h263_vdpau_hwaccel_select="vdpau h263_decoder"
+ h263_vaapi_hwaccel_deps="vaapi"
+ h263_vaapi_hwaccel_select="h263_decoder"
+ h263_vdpau_hwaccel_deps="vdpau"
+ h263_vdpau_hwaccel_select="h263_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"
+ h264_vaapi_hwaccel_deps="vaapi"
+ h264_vaapi_hwaccel_select="h264_decoder"
++h264_vda_decoder_deps="vda"
++h264_vda_decoder_select="h264_decoder"
+ h264_vda_hwaccel_deps="vda"
+ h264_vda_hwaccel_select="h264_decoder"
+ h264_vdpau_decoder_deps="vdpau"
+ h264_vdpau_decoder_select="h264_decoder"
+ h264_vdpau_hwaccel_deps="vdpau"
+ h264_vdpau_hwaccel_select="h264_decoder"
+ mpeg_vdpau_decoder_deps="vdpau"
+ mpeg_vdpau_decoder_select="mpegvideo_decoder"
+ mpeg1_vdpau_decoder_deps="vdpau"
+ mpeg1_vdpau_decoder_select="mpeg1video_decoder"
+ mpeg1_vdpau_hwaccel_deps="vdpau"
+ mpeg1_vdpau_hwaccel_select="mpeg1video_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"
+ mpeg2_vaapi_hwaccel_deps="vaapi"
+ mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
+ mpeg2_vdpau_hwaccel_deps="vdpau"
+ mpeg2_vdpau_hwaccel_select="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"
+ mpeg4_vaapi_hwaccel_deps="vaapi"
+ mpeg4_vaapi_hwaccel_select="mpeg4_decoder"
+ mpeg4_vdpau_decoder_deps="vdpau"
+ mpeg4_vdpau_decoder_select="mpeg4_decoder"
+ mpeg4_vdpau_hwaccel_deps="vdpau"
+ mpeg4_vdpau_hwaccel_select="mpeg4_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"
+ vc1_vaapi_hwaccel_deps="vaapi"
+ vc1_vaapi_hwaccel_select="vc1_decoder"
+ vc1_vdpau_decoder_deps="vdpau"
+ vc1_vdpau_decoder_select="vc1_decoder"
+ vc1_vdpau_hwaccel_deps="vdpau"
+ vc1_vdpau_hwaccel_select="vc1_decoder"
 +wmv3_crystalhd_decoder_select="crystalhd"
  wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
  wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
  wmv3_vdpau_decoder_select="vc1_vdpau_decoder"