aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-04-13 17:20:50 -0300
committerJames Almer <jamrial@gmail.com>2017-04-13 17:20:50 -0300
commit8c71d1b06028b1de2558647f7db7421d1c6e9bee (patch)
tree5963eaa3df37f4c446259b1a53fa00ffbea5c798 /configure
parent5dba808064e7879c04d3e2fb4f10e709bedf51c2 (diff)
parent6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a (diff)
downloadffmpeg-8c71d1b06028b1de2558647f7db7421d1c6e9bee.tar.gz
Merge commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'
* commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a': build: Have old H.264/HEVC nvenc encoders select their new counterparts Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index e8301c886e..1c0962be6d 100755
--- 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"