Merge commit '9254344e11f9b016088ec6250724f74377f5d7a0'
authorClément Bœsch <u@pkh.me>
Sat, 8 Apr 2017 12:06:48 +0000 (14:06 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 8 Apr 2017 12:08:51 +0000 (14:08 +0200)
* commit '9254344e11f9b016088ec6250724f74377f5d7a0':
  configure: Move hardware-accelerated codec deps out of hwaccel section

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -2605,21 -2131,11 +2605,16 @@@ xvmc_deps="X11_extensions_XvMClib_h
  
  h263_vaapi_hwaccel_deps="vaapi"
  h263_vaapi_hwaccel_select="h263_decoder"
- h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser"
 +h263_videotoolbox_hwaccel_deps="videotoolbox"
 +h263_videotoolbox_hwaccel_select="h263_decoder"
 +h264_cuvid_hwaccel_deps="cuda cuvid"
 +h264_cuvid_hwaccel_select="h264_cuvid_decoder"
  h264_d3d11va_hwaccel_deps="d3d11va"
  h264_d3d11va_hwaccel_select="h264_decoder"
  h264_dxva2_hwaccel_deps="dxva2"
  h264_dxva2_hwaccel_select="h264_decoder"
- h264_mediacodec_decoder_deps="mediacodec"
 +h264_mediacodec_hwaccel_deps="mediacodec"
- h264_mediacodec_decoder_select="h264_mp4toannexb_bsf h264_parser"
- h264_mmal_decoder_deps="mmal"
  h264_mmal_hwaccel_deps="mmal"
- h264_omx_encoder_deps="omx"
  h264_qsv_hwaccel_deps="libmfx"
  h264_vaapi_hwaccel_deps="vaapi"
  h264_vaapi_hwaccel_select="h264_decoder"
@@@ -2629,113 -2143,44 +2622,87 @@@ h264_vda_hwaccel_deps="vda
  h264_vda_hwaccel_select="h264_decoder"
  h264_vda_old_hwaccel_deps="vda"
  h264_vda_old_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"
 +h264_videotoolbox_hwaccel_deps="videotoolbox"
 +h264_videotoolbox_hwaccel_select="h264_decoder"
 +hevc_cuvid_hwaccel_deps="cuda cuvid"
 +hevc_cuvid_hwaccel_select="hevc_cuvid_decoder"
  hevc_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"
  hevc_d3d11va_hwaccel_select="hevc_decoder"
- hevc_mediacodec_decoder_deps="mediacodec"
 +hevc_mediacodec_hwaccel_deps="mediacodec"
- hevc_mediacodec_decoder_select="hevc_mp4toannexb_bsf hevc_parser"
  hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
  hevc_dxva2_hwaccel_select="hevc_decoder"
  hevc_qsv_hwaccel_deps="libmfx"
 +hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC"
 +hevc_vaapi_hwaccel_select="hevc_decoder"
  hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC"
  hevc_vdpau_hwaccel_select="hevc_decoder"
- mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
- mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
- mpeg_vdpau_decoder_deps="vdpau"
- mpeg_vdpau_decoder_select="mpeg2video_decoder"
 +mjpeg_cuvid_hwaccel_deps="cuda cuvid"
 +mjpeg_cuvid_hwaccel_select="mjpeg_cuvid_decoder"
- mpeg1_vdpau_decoder_deps="vdpau"
- mpeg1_vdpau_decoder_select="mpeg1video_decoder"
 +mpeg_xvmc_hwaccel_deps="xvmc"
 +mpeg_xvmc_hwaccel_select="mpeg2video_decoder"
 +mpeg1_cuvid_hwaccel_deps="cuda cuvid"
 +mpeg1_cuvid_hwaccel_select="mpeg1_cuvid_decoder"
  mpeg1_vdpau_hwaccel_deps="vdpau"
  mpeg1_vdpau_hwaccel_select="mpeg1video_decoder"
- mpeg2_crystalhd_decoder_select="crystalhd"
 +mpeg1_videotoolbox_hwaccel_deps="videotoolbox"
 +mpeg1_videotoolbox_hwaccel_select="mpeg1video_decoder"
 +mpeg1_xvmc_hwaccel_deps="xvmc"
 +mpeg1_xvmc_hwaccel_select="mpeg1video_decoder"
 +mpeg2_cuvid_hwaccel_deps="cuda cuvid"
 +mpeg2_cuvid_hwaccel_select="mpeg2_cuvid_decoder"
  mpeg2_d3d11va_hwaccel_deps="d3d11va"
  mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"
  mpeg2_dxva2_hwaccel_deps="dxva2"
  mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
- mpeg2_mmal_decoder_deps="mmal"
  mpeg2_mmal_hwaccel_deps="mmal"
  mpeg2_qsv_hwaccel_deps="libmfx"
 +mpeg2_qsv_hwaccel_select="qsvdec_mpeg2"
  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"
 +mpeg2_videotoolbox_hwaccel_deps="videotoolbox"
 +mpeg2_videotoolbox_hwaccel_select="mpeg2video_decoder"
 +mpeg2_xvmc_hwaccel_deps="xvmc"
 +mpeg2_xvmc_hwaccel_select="mpeg2video_decoder"
- mpeg4_mediacodec_decoder_deps="mediacodec"
 +mpeg4_cuvid_hwaccel_deps="cuda cuvid"
 +mpeg4_cuvid_hwaccel_select="mpeg4_cuvid_decoder"
- mpeg4_mmal_decoder_deps="mmal"
 +mpeg4_mediacodec_hwaccel_deps="mediacodec"
- mpeg4_omx_encoder_deps="omx"
 +mpeg4_mmal_hwaccel_deps="mmal"
  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"
 +mpeg4_videotoolbox_hwaccel_deps="videotoolbox"
 +mpeg4_videotoolbox_hwaccel_select="mpeg4_decoder"
 +vc1_cuvid_hwaccel_deps="cuda cuvid"
 +vc1_cuvid_hwaccel_select="vc1_cuvid_decoder"
  vc1_d3d11va_hwaccel_deps="d3d11va"
  vc1_d3d11va_hwaccel_select="vc1_decoder"
  vc1_dxva2_hwaccel_deps="dxva2"
  vc1_dxva2_hwaccel_select="vc1_decoder"
- vc1_mmal_decoder_deps="mmal"
  vc1_mmal_hwaccel_deps="mmal"
  vc1_qsv_hwaccel_deps="libmfx"
 +vc1_qsv_hwaccel_select="qsvdec_vc1"
  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"
- vp8_mediacodec_decoder_deps="mediacodec"
 +vp8_cuvid_hwaccel_deps="cuda cuvid"
 +vp8_cuvid_hwaccel_select="vp8_cuvid_decoder"
 +vp9_cuvid_hwaccel_deps="cuda cuvid"
 +vp9_cuvid_hwaccel_select="vp9_cuvid_decoder"
 +vp8_mediacodec_hwaccel_deps="mediacodec"
  vp8_qsv_hwaccel_deps="libmfx"
 -vp8_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferVP8"
 -vp8_vaapi_hwaccel_select="vp8_decoder"
 +vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9"
 +vp9_d3d11va_hwaccel_select="vp9_decoder"
 +vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
 +vp9_dxva2_hwaccel_select="vp9_decoder"
- vp9_mediacodec_decoder_deps="mediacodec"
 +vp9_mediacodec_hwaccel_deps="mediacodec"
 +vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9_bit_depth"
 +vp9_vaapi_hwaccel_select="vp9_decoder"
- wmv3_crystalhd_decoder_select="crystalhd"
  wmv3_d3d11va_hwaccel_select="vc1_d3d11va_hwaccel"
  wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
  wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
@@@ -2752,48 -2198,38 +2718,81 @@@ vaapi_encode_deps="vaapi
  hwupload_cuda_filter_deps="cuda"
  scale_npp_filter_deps="cuda libnpp"
  
 +nvenc_deps="cuda"
 +nvenc_deps_any="dlopen LoadLibrary"
 +nvenc_encoder_deps="nvenc"
++
++h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser"
 +h264_cuvid_decoder_deps="cuda cuvid"
 +h264_cuvid_decoder_select="h264_mp4toannexb_bsf"
++h264_mediacodec_decoder_deps="mediacodec"
++h264_mediacodec_decoder_select="h264_mp4toannexb_bsf h264_parser"
+ h264_mmal_decoder_deps="mmal"
  h264_nvenc_encoder_deps="nvenc"
+ h264_omx_encoder_deps="omx"
  h264_qsv_decoder_deps="libmfx"
  h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"
  h264_qsv_encoder_deps="libmfx"
  h264_qsv_encoder_select="qsvenc"
  h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
  h264_vaapi_encoder_select="vaapi_encode golomb"
++h264_vda_decoder_deps="vda"
++h264_vda_decoder_select="h264_decoder"
++h264_vdpau_decoder_deps="vdpau"
++h264_vdpau_decoder_select="h264_decoder"
 +hevc_cuvid_decoder_deps="cuda cuvid"
 +hevc_cuvid_decoder_select="hevc_mp4toannexb_bsf"
++hevc_mediacodec_decoder_deps="mediacodec"
++hevc_mediacodec_decoder_select="hevc_mp4toannexb_bsf hevc_parser"
  hevc_nvenc_encoder_deps="nvenc"
  hevc_qsv_decoder_deps="libmfx"
 +hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel"
  hevc_qsv_encoder_deps="libmfx"
 -hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser hevc_qsv_hwaccel qsvdec"
  hevc_qsv_encoder_select="qsvenc"
  hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC"
  hevc_vaapi_encoder_select="vaapi_encode golomb"
 +mjpeg_cuvid_decoder_deps="cuda cuvid"
+ mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
+ mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
 +mpeg1_cuvid_decoder_deps="cuda cuvid"
++mpeg1_vdpau_decoder_deps="vdpau"
++mpeg1_vdpau_decoder_select="mpeg1video_decoder"
++mpeg2_crystalhd_decoder_select="crystalhd"
 +mpeg2_cuvid_decoder_deps="cuda cuvid"
+ mpeg2_mmal_decoder_deps="mmal"
  mpeg2_qsv_decoder_deps="libmfx"
 -mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel mpegvideo_parser"
 +mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel"
  mpeg2_qsv_encoder_deps="libmfx"
  mpeg2_qsv_encoder_select="qsvenc"
 +mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2"
 +mpeg2_vaapi_encoder_select="vaapi_encode"
++mpeg4_crystalhd_decoder_select="crystalhd"
 +mpeg4_cuvid_decoder_deps="cuda cuvid"
++mpeg4_mediacodec_decoder_deps="mediacodec"
++mpeg4_mmal_decoder_deps="mmal"
+ mpeg4_omx_encoder_deps="omx"
++mpeg4_vdpau_decoder_deps="vdpau"
++mpeg4_vdpau_decoder_select="mpeg4_decoder"
++mpeg_vdpau_decoder_deps="vdpau"
++mpeg_vdpau_decoder_select="mpeg2video_decoder"
++msmpeg4_crystalhd_decoder_select="crystalhd"
 +nvenc_h264_encoder_deps="nvenc"
 +nvenc_hevc_encoder_deps="nvenc"
 -vc1_qsv_decoder_deps="libmfx"
 -vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser"
++vc1_crystalhd_decoder_select="crystalhd"
 +vc1_cuvid_decoder_deps="cuda cuvid"
+ vc1_mmal_decoder_deps="mmal"
++vc1_vdpau_decoder_deps="vdpau"
++vc1_vdpau_decoder_select="vc1_decoder"
 +vp8_cuvid_decoder_deps="cuda cuvid"
++vp8_mediacodec_decoder_deps="mediacodec"
  vp8_qsv_decoder_deps="libmfx"
  vp8_qsv_decoder_select="qsvdec vp8_qsv_hwaccel vp8_parser"
 -
 -nvenc_h264_encoder_deps="nvenc"
 -nvenc_hevc_encoder_deps="nvenc"
 +vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8"
 +vp8_vaapi_encoder_select="vaapi_encode"
 +vp9_cuvid_decoder_deps="cuda cuvid"
++vp9_mediacodec_decoder_deps="mediacodec"
++wmv3_crystalhd_decoder_select="crystalhd"
++wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
  
  # parsers
  h264_parser_select="golomb h264dsp h264parse"