[FFmpeg-cvslog] Merge commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Apr 13 17:20:50 2017 -0300| [8c71d1b06028b1de2558647f7db7421d1c6e9bee] | committer: James Almer

Merge commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'

* commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a':
  build: Have old H.264/HEVC nvenc encoders select their new counterparts

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c71d1b06028b1de2558647f7db7421d1c6e9bee
---

 configure | 4 ++--
 1 file 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"


======================================================================

diff --cc configure
index e8301c886e,98b123aee8..1c0962be6d
--- a/configure
+++ b/configure
@@@ -2741,63 -2213,29 +2741,63 @@@ h264_qsv_encoder_deps="libmfx
  h264_qsv_encoder_select="qsvenc"
  h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
  h264_vaapi_encoder_select="vaapi_encode golomb"
 +h264_vda_decoder_deps="vda"
 +h264_vda_decoder_select="h264_decoder"
 +h264_vdpau_decoder_deps="vdpau"
 +h264_vdpau_decoder_select="h264_decoder"
 +hevc_cuvid_decoder_deps="cuda cuvid"
 +hevc_cuvid_decoder_select="hevc_mp4toannexb_bsf"
 +hevc_mediacodec_decoder_deps="mediacodec"
 +hevc_mediacodec_decoder_select="hevc_mp4toannexb_bsf hevc_parser"
  hevc_nvenc_encoder_deps="nvenc"
  hevc_qsv_decoder_deps="libmfx"
 +hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel"
  hevc_qsv_encoder_deps="libmfx"
 -hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser hevc_qsv_hwaccel qsvdec"
 -hevc_qsv_encoder_select="qsvenc"
 +hevc_qsv_encoder_select="hevcparse qsvenc"
  hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC"
  hevc_vaapi_encoder_select="vaapi_encode golomb"
 +mjpeg_cuvid_decoder_deps="cuda cuvid"
  mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
  mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
 +mpeg1_cuvid_decoder_deps="cuda cuvid"
 +mpeg1_vdpau_decoder_deps="vdpau"
 +mpeg1_vdpau_decoder_select="mpeg1video_decoder"
 +mpeg2_crystalhd_decoder_select="crystalhd"
 +mpeg2_cuvid_decoder_deps="cuda cuvid"
  mpeg2_mmal_decoder_deps="mmal"
  mpeg2_qsv_decoder_deps="libmfx"
 -mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel mpegvideo_parser"
 +mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel"
  mpeg2_qsv_encoder_deps="libmfx"
  mpeg2_qsv_encoder_select="qsvenc"
 +mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2"
 +mpeg2_vaapi_encoder_select="vaapi_encode"
 +mpeg4_crystalhd_decoder_select="crystalhd"
 +mpeg4_cuvid_decoder_deps="cuda cuvid"
 +mpeg4_mediacodec_decoder_deps="mediacodec"
 +mpeg4_mmal_decoder_deps="mmal"
  mpeg4_omx_encoder_deps="omx"
 +mpeg4_vdpau_decoder_deps="vdpau"
 +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"
 -vc1_qsv_decoder_deps="libmfx"
 -vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser"
 +vc1_vdpau_decoder_deps="vdpau"
 +vc1_vdpau_decoder_select="vc1_decoder"
 +vp8_cuvid_decoder_deps="cuda cuvid"
 +vp8_mediacodec_decoder_deps="mediacodec"
  vp8_qsv_decoder_deps="libmfx"
  vp8_qsv_decoder_select="qsvdec vp8_qsv_hwaccel vp8_parser"
 -
 -nvenc_h264_encoder_select="h264_nvenc_encoder"
 -nvenc_hevc_encoder_select="hevc_nvenc_encoder"
 +vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8"
 +vp8_vaapi_encoder_select="vaapi_encode"
 +vp9_cuvid_decoder_deps="cuda cuvid"
 +vp9_mediacodec_decoder_deps="mediacodec"
 +wmv3_crystalhd_decoder_select="crystalhd"
 +wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
  
  # parsers
  h264_parser_select="golomb h264dsp h264parse"