Merge commit '1520c6ff05d835da4b793318fc88bbbc129c86a1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:41:29 +0000 (13:41 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:41:29 +0000 (13:41 +0100)
commit5fc17edc7dcec5ea2989a0d764f3cfb666a7e663
tree170cd8636cf774a00333e854229ab880170c8b3d
parent31ae2308b3f6c1021d79da69c504490239895d60
parent1520c6ff05d835da4b793318fc88bbbc129c86a1
Merge commit '1520c6ff05d835da4b793318fc88bbbc129c86a1'

* commit '1520c6ff05d835da4b793318fc88bbbc129c86a1':
  nvenc: export CPB props side data

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/nvenc.c