Merge commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'
authorJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 20:20:50 +0000 (17:20 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 20:20:50 +0000 (17:20 -0300)
* commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a':
  build: Have old H.264/HEVC nvenc encoders select their new counterparts

Merged-by: James Almer <jamrial@gmail.com>
configure

index e8301c8..1c0962b 100755 (executable)
--- a/configure
+++ b/configure
@@ -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"