Merge commit '5845a8273e4694e0254ad728970b82bb64fd8bc0'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:50:36 +0000 (13:50 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:50:36 +0000 (13:50 +0100)
commitf95385dd580604aa287b41093edd692f34c7613b
treeae4542337c6b9bd95fb084eb94c97bdfec1c6506
parentb2d8b91cf0a21537c893d52dc487bfd79988f234
parent5845a8273e4694e0254ad728970b82bb64fd8bc0
Merge commit '5845a8273e4694e0254ad728970b82bb64fd8bc0'

* commit '5845a8273e4694e0254ad728970b82bb64fd8bc0':
  movenc: use the CPB props side data

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