[FFmpeg-cvslog] Merge commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Dec 18 14:53:19 2015 +0100| [06d69a2d225ae0db433b62f0fa537b06e29b0db5] | committer: Hendrik Leppkes

Merge commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3'

* commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3':
  mpegvideo_enc: actually add the side data with vbv_delay to the packet

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

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