Merge commit '825900248b4053515803152d3165efdb034b660b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:42:53 +0000 (13:42 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:42:53 +0000 (13:42 +0100)
commitb2d8b91cf0a21537c893d52dc487bfd79988f234
tree937ca79ddcd61f27244004026a6d7fc4d109a178
parent5fc17edc7dcec5ea2989a0d764f3cfb666a7e663
parent825900248b4053515803152d3165efdb034b660b
Merge commit '825900248b4053515803152d3165efdb034b660b'

* commit '825900248b4053515803152d3165efdb034b660b':
  qsvenc: export CPB props side data

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