[FFmpeg-cvslog] Merge commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Dec 17 13:55:39 2015 +0100| [079b5d4ef888bd42bf0147a6d964b8bc9ec0f3c5] | committer: Hendrik Leppkes

Merge commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca'

* commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca':
  mpegenc: use the CPB props side data

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

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