[FFmpeg-cvslog] Merge commit '732a37d1466d45b3812509d68c82e783530e291a'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Dec 17 13:34:51 2015 +0100| [b77061b5caceb07b4487a08e48f78a5b24c15959] | committer: Hendrik Leppkes

Merge commit '732a37d1466d45b3812509d68c82e783530e291a'

* commit '732a37d1466d45b3812509d68c82e783530e291a':
  libx264: 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=b77061b5caceb07b4487a08e48f78a5b24c15959
---