Merge commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad'

* commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad':
  lavf: Dump the cpb side data information

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavformat/dump.c
index eaf87fe06137c153e2bb8881c8c8ccb57d6eaa08,345d2a95fc1c30f6029b20c3f843eee2b5d69bf8..56c285d8324e59fe4e1c92b3e6730d855b48d6c8
--- 1/libavformat/dump.c
--- 2/libavformat/dump.c
+++ b/libavformat/dump.c
@@@ -377,9 -375,13 +393,13 @@@ static void dump_sidedata(void *ctx, AV
              av_log(ctx, AV_LOG_INFO, "audio service type: ");
              dump_audioservicetype(ctx, &sd);
              break;
 -        case AV_PKT_DATA_QUALITY_FACTOR:
 -            av_log(ctx, AV_LOG_INFO, "quality factor: %d", *(int *)sd.data);
 +        case AV_PKT_DATA_QUALITY_STATS:
 +            av_log(ctx, AV_LOG_INFO, "quality factor: %d, pict_type: %c", AV_RL32(sd.data), av_get_picture_type_char(sd.data[4]));
              break;
+         case AV_PKT_DATA_CPB_PROPERTIES:
+             av_log(ctx, AV_LOG_INFO, "cpb: ");
+             dump_cpb(ctx, &sd);
+             break;
          default:
              av_log(ctx, AV_LOG_WARNING,
                     "unknown side data type %d (%d bytes)", sd.type, sd.size);