Commit 8c71d1b0 authored by James Almer's avatar James Almer

Merge commit '6bd9590b'

* commit '6bd9590b':
  build: Have old H.264/HEVC nvenc encoders select their new counterparts
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 5dba8080 6bd9590b
...@@ -2781,8 +2781,8 @@ mpeg4_vdpau_decoder_select="mpeg4_decoder" ...@@ -2781,8 +2781,8 @@ mpeg4_vdpau_decoder_select="mpeg4_decoder"
mpeg_vdpau_decoder_deps="vdpau" mpeg_vdpau_decoder_deps="vdpau"
mpeg_vdpau_decoder_select="mpeg2video_decoder" mpeg_vdpau_decoder_select="mpeg2video_decoder"
msmpeg4_crystalhd_decoder_select="crystalhd" msmpeg4_crystalhd_decoder_select="crystalhd"
nvenc_h264_encoder_deps="nvenc" nvenc_h264_encoder_select="h264_nvenc_encoder"
nvenc_hevc_encoder_deps="nvenc" nvenc_hevc_encoder_select="hevc_nvenc_encoder"
vc1_crystalhd_decoder_select="crystalhd" vc1_crystalhd_decoder_select="crystalhd"
vc1_cuvid_decoder_deps="cuda cuvid" vc1_cuvid_decoder_deps="cuda cuvid"
vc1_mmal_decoder_deps="mmal" vc1_mmal_decoder_deps="mmal"
......
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