Merge commit 'e16b20782a597e36a9c7488487c3179375a25b97'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:57:49 +0000 (13:57 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:57:49 +0000 (13:57 -0300)
commit27e30c73d722ec13e59753dea91be00859c72bf2
tree9dc276a56b52057ad6f10c168a2512adaece3de5
parentff44c2d4f483cda53859ce019f3815c69239a7e0
parente16b20782a597e36a9c7488487c3179375a25b97
Merge commit 'e16b20782a597e36a9c7488487c3179375a25b97'

* commit 'e16b20782a597e36a9c7488487c3179375a25b97':
  lavc/qsvenc: allow to set qp range for h264 BRC

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