diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-13 17:20:50 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-13 17:20:50 -0300 |
| commit | 8c71d1b06028b1de2558647f7db7421d1c6e9bee (patch) | |
| tree | 5963eaa3df37f4c446259b1a53fa00ffbea5c798 | |
| parent | 5dba808064e7879c04d3e2fb4f10e709bedf51c2 (diff) | |
| parent | 6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a (diff) | |
| download | ffmpeg-streaming-8c71d1b06028b1de2558647f7db7421d1c6e9bee.zip ffmpeg-streaming-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>
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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" |
