Merge commit '03afb62e83516141ba999536fc97575faefb98af'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:33:20 +0000 (13:33 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:33:20 +0000 (13:33 +0100)
commitd6322710c5ec51086aefef9037311922c7aa646c
treea7d35db28260c5d7022e75e118207be1ea6bd2b1
parentf49264a1c5912ee2bc23e7a09ded1024a178cf04
parent03afb62e83516141ba999536fc97575faefb98af
Merge commit '03afb62e83516141ba999536fc97575faefb98af'

* commit '03afb62e83516141ba999536fc97575faefb98af':
  libvpxenc: export CPB props side data

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