Merge commit '6ff29343b01923e9b125fe7404ac8701cdfb1fe5'
authorJames Almer <jamrial@gmail.com>
Thu, 14 Dec 2017 21:44:42 +0000 (18:44 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 14 Dec 2017 21:44:42 +0000 (18:44 -0300)
commit0929def32765807d156860fb13af1154ce4a249a
treedef5ee0398415518660be24d2e1199312aea6ac8
parent5fc649505b2ddb72eee3fcb8611d3d715cd0f718
parent6ff29343b01923e9b125fe7404ac8701cdfb1fe5
Merge commit '6ff29343b01923e9b125fe7404ac8701cdfb1fe5'

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

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/qsvenc.c