Commit 09027c89 authored by Clément Bœsch's avatar Clément Bœsch

Merge commit 'd4f2a681'

* commit 'd4f2a681':
  configure: MMAL-related decoders should depend on, not select, mmal
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents b438a786 d4f2a681
...@@ -2618,7 +2618,6 @@ h264_mediacodec_decoder_deps="mediacodec" ...@@ -2618,7 +2618,6 @@ h264_mediacodec_decoder_deps="mediacodec"
h264_mediacodec_hwaccel_deps="mediacodec" h264_mediacodec_hwaccel_deps="mediacodec"
h264_mediacodec_decoder_select="h264_mp4toannexb_bsf h264_parser" h264_mediacodec_decoder_select="h264_mp4toannexb_bsf h264_parser"
h264_mmal_decoder_deps="mmal" h264_mmal_decoder_deps="mmal"
h264_mmal_decoder_select="mmal"
h264_mmal_hwaccel_deps="mmal" h264_mmal_hwaccel_deps="mmal"
h264_omx_encoder_deps="omx" h264_omx_encoder_deps="omx"
h264_qsv_hwaccel_deps="libmfx" h264_qsv_hwaccel_deps="libmfx"
...@@ -2676,7 +2675,6 @@ mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder" ...@@ -2676,7 +2675,6 @@ mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"
mpeg2_dxva2_hwaccel_deps="dxva2" mpeg2_dxva2_hwaccel_deps="dxva2"
mpeg2_dxva2_hwaccel_select="mpeg2video_decoder" mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
mpeg2_mmal_decoder_deps="mmal" mpeg2_mmal_decoder_deps="mmal"
mpeg2_mmal_decoder_select="mmal"
mpeg2_mmal_hwaccel_deps="mmal" mpeg2_mmal_hwaccel_deps="mmal"
mpeg2_qsv_hwaccel_deps="libmfx" mpeg2_qsv_hwaccel_deps="libmfx"
mpeg2_qsv_hwaccel_select="qsvdec_mpeg2" mpeg2_qsv_hwaccel_select="qsvdec_mpeg2"
...@@ -2694,7 +2692,6 @@ mpeg4_cuvid_hwaccel_select="mpeg4_cuvid_decoder" ...@@ -2694,7 +2692,6 @@ mpeg4_cuvid_hwaccel_select="mpeg4_cuvid_decoder"
mpeg4_mediacodec_decoder_deps="mediacodec" mpeg4_mediacodec_decoder_deps="mediacodec"
mpeg4_mediacodec_hwaccel_deps="mediacodec" mpeg4_mediacodec_hwaccel_deps="mediacodec"
mpeg4_mmal_decoder_deps="mmal" mpeg4_mmal_decoder_deps="mmal"
mpeg4_mmal_decoder_select="mmal"
mpeg4_mmal_hwaccel_deps="mmal" mpeg4_mmal_hwaccel_deps="mmal"
mpeg4_omx_encoder_deps="omx" mpeg4_omx_encoder_deps="omx"
mpeg4_vaapi_hwaccel_deps="vaapi" mpeg4_vaapi_hwaccel_deps="vaapi"
...@@ -2714,7 +2711,6 @@ vc1_d3d11va_hwaccel_select="vc1_decoder" ...@@ -2714,7 +2711,6 @@ vc1_d3d11va_hwaccel_select="vc1_decoder"
vc1_dxva2_hwaccel_deps="dxva2" vc1_dxva2_hwaccel_deps="dxva2"
vc1_dxva2_hwaccel_select="vc1_decoder" vc1_dxva2_hwaccel_select="vc1_decoder"
vc1_mmal_decoder_deps="mmal" vc1_mmal_decoder_deps="mmal"
vc1_mmal_decoder_select="mmal"
vc1_mmal_hwaccel_deps="mmal" vc1_mmal_hwaccel_deps="mmal"
vc1_qsv_hwaccel_deps="libmfx" vc1_qsv_hwaccel_deps="libmfx"
vc1_qsv_hwaccel_select="qsvdec_vc1" vc1_qsv_hwaccel_select="qsvdec_vc1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment