[FFmpeg-cvslog] Merge commit '6ff29343b01923e9b125fe7404ac8701cdfb1fe5'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Dec 14 18:44:42 2017 -0300| [0929def32765807d156860fb13af1154ce4a249a] | committer: James Almer

Merge commit '6ff29343b01923e9b125fe7404ac8701cdfb1fe5'

* commit '6ff29343b01923e9b125fe7404ac8701cdfb1fe5':
  lavc/qsvenc: set HRD buffer size

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

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

 libavcodec/qsvenc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index fbd4d85379..74d901973b 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -495,6 +495,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
 #if QSV_HAVE_VCM
     case MFX_RATECONTROL_VCM:
 #endif
+        q->param.mfx.BufferSizeInKB   = avctx->rc_buffer_size / 8000;
         q->param.mfx.InitialDelayInKB = avctx->rc_initial_buffer_occupancy / 1000;
         q->param.mfx.TargetKbps       = avctx->bit_rate / 1000;
         q->param.mfx.MaxKbps          = avctx->rc_max_rate / 1000;


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