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)
commitb799619f48ba5fd07e91243f27f74638bcb875fb
treeddffb2e8506020dbaf07b3847e5b2378aaa35404
parentb77061b5caceb07b4487a08e48f78a5b24c15959
parent3f5c99fcbb2c366d7bdef8500c19f43a33bdb6b9
Merge commit '3f5c99fcbb2c366d7bdef8500c19f43a33bdb6b9'

* commit '3f5c99fcbb2c366d7bdef8500c19f43a33bdb6b9':
  mpegvideo_enc: export CPB props side data

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