Merge commit 'c8bca9fe466f810fd484e2c6db7ef7bc83b5a943'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:01:47 +0000 (14:01 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:01:47 +0000 (14:01 -0300)
* commit 'c8bca9fe466f810fd484e2c6db7ef7bc83b5a943':
  lavc/qsvenc: dump BufferSizeInKB message

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

Simple merge