]> git.sesse.net Git - ffmpeg/commit - libavutil/tests/cpu.c
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)
commita12063b118ad05409ff775ba30fab00265ad3031
tree9e723ee226fcfd67fd3830ded1fe76080dfb1f5e
parent27e30c73d722ec13e59753dea91be00859c72bf2
parentc8bca9fe466f810fd484e2c6db7ef7bc83b5a943
Merge commit 'c8bca9fe466f810fd484e2c6db7ef7bc83b5a943'

* commit 'c8bca9fe466f810fd484e2c6db7ef7bc83b5a943':
  lavc/qsvenc: dump BufferSizeInKB message

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