[FFmpeg-cvslog] Merge commit 'd4f2a681cb6d4e913f1c879ad376313255d6cf4c'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  8 13:51:57 2017 +0200| [09027c89777edea068b182d7d850b828a439cb3c] | committer: Clément Bœsch

Merge commit 'd4f2a681cb6d4e913f1c879ad376313255d6cf4c'

* commit 'd4f2a681cb6d4e913f1c879ad376313255d6cf4c':
  configure: MMAL-related decoders should depend on, not select, mmal

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09027c89777edea068b182d7d850b828a439cb3c
---

 configure | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/configure b/configure
index 6dc0b7a..7ad69b2 100755
--- a/configure
+++ b/configure
@@ -2618,7 +2618,6 @@ 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_decoder_select="mmal"
 h264_mmal_hwaccel_deps="mmal"
 h264_omx_encoder_deps="omx"
 h264_qsv_hwaccel_deps="libmfx"
@@ -2676,7 +2675,6 @@ mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"
 mpeg2_dxva2_hwaccel_deps="dxva2"
 mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
 mpeg2_mmal_decoder_deps="mmal"
-mpeg2_mmal_decoder_select="mmal"
 mpeg2_mmal_hwaccel_deps="mmal"
 mpeg2_qsv_hwaccel_deps="libmfx"
 mpeg2_qsv_hwaccel_select="qsvdec_mpeg2"
@@ -2694,7 +2692,6 @@ mpeg4_cuvid_hwaccel_select="mpeg4_cuvid_decoder"
 mpeg4_mediacodec_decoder_deps="mediacodec"
 mpeg4_mediacodec_hwaccel_deps="mediacodec"
 mpeg4_mmal_decoder_deps="mmal"
-mpeg4_mmal_decoder_select="mmal"
 mpeg4_mmal_hwaccel_deps="mmal"
 mpeg4_omx_encoder_deps="omx"
 mpeg4_vaapi_hwaccel_deps="vaapi"
@@ -2714,7 +2711,6 @@ vc1_d3d11va_hwaccel_select="vc1_decoder"
 vc1_dxva2_hwaccel_deps="dxva2"
 vc1_dxva2_hwaccel_select="vc1_decoder"
 vc1_mmal_decoder_deps="mmal"
-vc1_mmal_decoder_select="mmal"
 vc1_mmal_hwaccel_deps="mmal"
 vc1_qsv_hwaccel_deps="libmfx"
 vc1_qsv_hwaccel_select="qsvdec_vc1"


======================================================================

diff --cc configure
index 6dc0b7a,30d1c7e..7ad69b2
--- a/configure
+++ b/configure
@@@ -2614,11 -2135,7 +2614,10 @@@ 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_decoder_select="mmal"
  h264_mmal_hwaccel_deps="mmal"
  h264_omx_encoder_deps="omx"
  h264_qsv_hwaccel_deps="libmfx"
@@@ -2676,26 -2163,12 +2675,24 @@@ mpeg2_d3d11va_hwaccel_select="mpeg2vide
  mpeg2_dxva2_hwaccel_deps="dxva2"
  mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
  mpeg2_mmal_decoder_deps="mmal"
- mpeg2_mmal_decoder_select="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"
 +mpeg2_videotoolbox_hwaccel_deps="videotoolbox"
 +mpeg2_videotoolbox_hwaccel_select="mpeg2video_decoder"
 +mpeg2_xvmc_hwaccel_deps="xvmc"
 +mpeg2_xvmc_hwaccel_select="mpeg2video_decoder"
 +mpeg4_crystalhd_decoder_select="crystalhd"
 +mpeg4_cuvid_hwaccel_deps="cuda cuvid"
 +mpeg4_cuvid_hwaccel_select="mpeg4_cuvid_decoder"
 +mpeg4_mediacodec_decoder_deps="mediacodec"
 +mpeg4_mediacodec_hwaccel_deps="mediacodec"
 +mpeg4_mmal_decoder_deps="mmal"
- mpeg4_mmal_decoder_select="mmal"
 +mpeg4_mmal_hwaccel_deps="mmal"
  mpeg4_omx_encoder_deps="omx"
  mpeg4_vaapi_hwaccel_deps="vaapi"
  mpeg4_vaapi_hwaccel_select="mpeg4_decoder"
@@@ -2714,32 -2179,15 +2711,31 @@@ vc1_d3d11va_hwaccel_select="vc1_decoder
  vc1_dxva2_hwaccel_deps="dxva2"
  vc1_dxva2_hwaccel_select="vc1_decoder"
  vc1_mmal_decoder_deps="mmal"
- vc1_mmal_decoder_select="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_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_decoder_deps="mediacodec"
 +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"