Merge commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'

* commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a': build: Have old H.264/HEVC nvenc encoders select their new counterparts Merged-by: James Almer <jamrial@gmail.com>
8 years ago · 8c71d1b060
parent 5dba808064 6bd9590b33
commit 8c71d1b060
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -2781,8 +2781,8 @@ 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"
+nvenc_h264_encoder_select="h264_nvenc_encoder"
+nvenc_hevc_encoder_select="hevc_nvenc_encoder"
 vc1_crystalhd_decoder_select="crystalhd"
 vc1_cuvid_decoder_deps="cuda cuvid"
 vc1_mmal_decoder_deps="mmal"