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)
* commit '6ff29343b01923e9b125fe7404ac8701cdfb1fe5':
  lavc/qsvenc: set HRD buffer size

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

Simple merge