Merge commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:55:39 +0000 (13:55 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:55:39 +0000 (13:55 +0100)
commit079b5d4ef888bd42bf0147a6d964b8bc9ec0f3c5
tree7db47f770ed1487fc1229e8b6f47f05641da47aa
parentf95385dd580604aa287b41093edd692f34c7613b
parent8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca
Merge commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca'

* commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca':
  mpegenc: use the CPB props side data

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