Merge commit '11c9bd633f635f07a762be1ecd672de55daf4edc'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/internal.h
index afcf00d013f8b4519e2baaa49dcb53903831f018,7f12344533fe2e575f425eee3fca1daa5baf143d..482d8debcd4ae772707c81a2a9a5946f833ddafa
--- 1/libavcodec/internal.h
--- 2/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@@ -323,6 -240,9 +323,11 @@@ int ff_get_format(AVCodecContext *avctx
   */
  int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame);
  
+ /**
+  * Add a CPB properties side data to an encoding context.
+  */
+ AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx);
+ 
 +int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type);
 +
  #endif /* AVCODEC_INTERNAL_H */

diff --cc libavcodec/libopenh264enc.c
Simple merge

diff --cc libavcodec/utils.c
Simple merge