Merge commit '11c9bd633f635f07a762be1ecd672de55daf4edc'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:31:21 +0000 (13:31 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:31:21 +0000 (13:31 +0100)
commitf49264a1c5912ee2bc23e7a09ded1024a178cf04
tree8175c3e1c1f8a41ef936b5c8512d0817be72985b
parentdd6ee019ea828a2700e38366983ef343612021c6
parent11c9bd633f635f07a762be1ecd672de55daf4edc
Merge commit '11c9bd633f635f07a762be1ecd672de55daf4edc'

* commit '11c9bd633f635f07a762be1ecd672de55daf4edc':
  libopenh264enc: export CPB props side data

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/internal.h
libavcodec/libopenh264enc.c
libavcodec/utils.c