[FFmpeg-cvslog] Merge commit '1520c6ff05d835da4b793318fc88bbbc129c86a1'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Dec 17 13:41:29 2015 +0100| [5fc17edc7dcec5ea2989a0d764f3cfb666a7e663] | committer: Hendrik Leppkes

Merge commit '1520c6ff05d835da4b793318fc88bbbc129c86a1'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5fc17edc7dcec5ea2989a0d764f3cfb666a7e663
---