Merge commit '732a37d1466d45b3812509d68c82e783530e291a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:34:51 +0000 (13:34 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:34:51 +0000 (13:34 +0100)
commitb77061b5caceb07b4487a08e48f78a5b24c15959
tree8209bd4dfbf170f600b6115571bfccf0d9515dfc
parentd6322710c5ec51086aefef9037311922c7aa646c
parent732a37d1466d45b3812509d68c82e783530e291a
Merge commit '732a37d1466d45b3812509d68c82e783530e291a'

* commit '732a37d1466d45b3812509d68c82e783530e291a':
  libx264: export CPB props side data

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