Merge commit '2507b5dd674834be7261772996f47ae3b95cca69'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:36:09 +0000 (13:36 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:36:09 +0000 (13:36 +0100)
commit31ae2308b3f6c1021d79da69c504490239895d60
tree4760053d9a303c341ab1eca82582b982ea3d5bfd
parentb799619f48ba5fd07e91243f27f74638bcb875fb
parent2507b5dd674834be7261772996f47ae3b95cca69
Merge commit '2507b5dd674834be7261772996f47ae3b95cca69'

* commit '2507b5dd674834be7261772996f47ae3b95cca69':
  mpegvideo_enc: export vbv_delay in side data

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