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)
* commit '825900248b4053515803152d3165efdb034b660b':
  qsvenc: export CPB props side data

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

Simple merge