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)
* commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3':
  mpegvideo_enc: actually add the side data with vbv_delay to the packet

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

Simple merge