Merge commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Dec 2015 13:53:19 +0000 (14:53 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Dec 2015 13:53:19 +0000 (14:53 +0100)
commit06d69a2d225ae0db433b62f0fa537b06e29b0db5
tree367855f79370e79a42ff44d6238ab3ba3f1c4fc9
parent3564dfd535743ad586c10800c7f931e5bf3cbde7
parent458e53f51fc75d08df884f8e9eb3d7ded23e97b3
Merge commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3'

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

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