Merge commit '732a37d1466d45b3812509d68c82e783530e291a'

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

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

diff --cc libavcodec/libx264.c
index 82625b7ae9a28cc1e745dc6671a9d5598ec88e4d,e2648f3e76d86e9c662f0352ab2a8581d1b9dbac..c97ae3871fdd206d863bad4cd80ee7f975ea04f3
--- 1/libavcodec/libx264.c
--- 2/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@@ -452,10 -351,7 +452,11 @@@ static int convert_pix_fmt(enum AVPixel
  static av_cold int X264_init(AVCodecContext *avctx)
  {
      X264Context *x4 = avctx->priv_data;
+     AVCPBProperties *cpb_props;
 +    int sw,sh;
 +
 +    if (avctx->global_quality > 0)
 +        av_log(avctx, AV_LOG_WARNING, "-qscale is ignored, -crf is recommended.\n");
  
  #if CONFIG_LIBX262_ENCODER
      if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO) {