Merge commit '3f5c99fcbb2c366d7bdef8500c19f43a33bdb6b9'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:35:34 +0000 (13:35 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:35:34 +0000 (13:35 +0100)
* commit '3f5c99fcbb2c366d7bdef8500c19f43a33bdb6b9':
  mpegvideo_enc: export CPB props side data

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

Simple merge