Merge commit 'f0b769c16daafa64720dcba7fa81a9f5255e1d29'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:25:52 +0000 (13:25 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:25:52 +0000 (13:25 +0100)
commitdd6ee019ea828a2700e38366983ef343612021c6
tree1c5d8ea9a7d23133d4caa4887cf787d936b33049
parentbe52b95d311bb392fe99a6bb3b8db74e255043e3
parentf0b769c16daafa64720dcba7fa81a9f5255e1d29
Merge commit 'f0b769c16daafa64720dcba7fa81a9f5255e1d29'

* commit 'f0b769c16daafa64720dcba7fa81a9f5255e1d29':
  lavc: add a packet side data type for VBV-like parameters

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c