diff options
| author | Clément Bœsch <u@pkh.me> | 2017-04-08 13:51:57 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-04-08 13:51:57 +0200 |
| commit | 09027c89777edea068b182d7d850b828a439cb3c (patch) | |
| tree | 81851870919635f036bacce84052106295795acf | |
| parent | b438a7868c8a672f103a6b50e9572f5d31f23ce3 (diff) | |
| parent | d4f2a681cb6d4e913f1c879ad376313255d6cf4c (diff) | |
| download | ffmpeg-09027c89777edea068b182d7d850b828a439cb3c.tar.gz | |
Merge commit 'd4f2a681cb6d4e913f1c879ad376313255d6cf4c'
* commit 'd4f2a681cb6d4e913f1c879ad376313255d6cf4c':
configure: MMAL-related decoders should depend on, not select, mmal
Merged-by: Clément Bœsch <u@pkh.me>
| -rwxr-xr-x | configure | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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" |