Merge commit 'f0b769c16daafa64720dcba7fa81a9f5255e1d29'

* commit 'f0b769c16daafa64720dcba7fa81a9f5255e1d29':
  lavc: add a packet side data type for VBV-like parameters

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

diff --cc doc/APIchanges
index e99c7e647665b2e0cef2d4670e825b09a4fa8aac,8ae8be4d8375dbd5d1b1246f9a2131c5d063dd8e..02cb643f64731385e18959aa363dd88a1aa35a0b
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -14,14 -12,13 +14,15 @@@ libavutil:     2015-08-2
  
  
  API changes, most recent first:
 -
 -2015-xx-xx - xxxxxxx - lavc 57.11.0 - avcodec.h
 +2015-12-17 - lavc 57.18.100 / 57.11.0 - avcodec.h
    xxxxxxx - Add av_packet_add_side_data().
    xxxxxxx - Add AVCodecContext.coded_side_data.
+   xxxxxxx - Add AVCPBProperties API.
  
 -2015-xx-xx - xxxxxxx - lavc 57.9.1 - avcodec.h
 +2015-12-11 - xxxxxxx - lavf 57.20.100 - avformat.h
 +  Add av_program_add_stream_index()
 +
 +2015-11-29 - xxxxxxx - lavc 57.16.101 - avcodec.h
    Deprecate rtp_callback without replacement, i.e. it won't be possible to
    get image slices before the full frame is encoded any more. The libavformat
    rtpenc muxer can still be used for RFC-2190 packetization.

diff --cc libavcodec/avcodec.h
index 2821286d23fb31569c7bd32e3a3ab994c004cc93,dacbcd37335b58d89ccf975b101919d2e78a577e..e7f016cdccc78eff0b8cc496b3c1e5ee4967abe7
--- 1/libavcodec/avcodec.h
--- 2/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -1292,73 -1176,12 +1330,78 @@@ enum AVPacketSideDataType 
       */
      AV_PKT_DATA_FALLBACK_TRACK,
  
+     /**
+      * This side data corresponds to the AVCPBProperties struct.
+      */
+     AV_PKT_DATA_CPB_PROPERTIES,
++
 +    /**
 +     * Recommmends skipping the specified number of samples
 +     * @code
 +     * u32le number of samples to skip from start of this packet
 +     * u32le number of samples to skip from end of this packet
 +     * u8    reason for start skip
 +     * u8    reason for end   skip (0=padding silence, 1=convergence)
 +     * @endcode
 +     */
 +    AV_PKT_DATA_SKIP_SAMPLES=70,
 +
 +    /**
 +     * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that
 +     * the packet may contain "dual mono" audio specific to Japanese DTV
 +     * and if it is true, recommends only the selected channel to be used.
 +     * @code
 +     * u8    selected channels (0=mail/left, 1=sub/right, 2=both)
 +     * @endcode
 +     */
 +    AV_PKT_DATA_JP_DUALMONO,
 +
 +    /**
 +     * A list of zero terminated key/value strings. There is no end marker for
 +     * the list, so it is required to rely on the side data size to stop.
 +     */
 +    AV_PKT_DATA_STRINGS_METADATA,
 +
 +    /**
 +     * Subtitle event position
 +     * @code
 +     * u32le x1
 +     * u32le y1
 +     * u32le x2
 +     * u32le y2
 +     * @endcode
 +     */
 +    AV_PKT_DATA_SUBTITLE_POSITION,
 +
 +    /**
 +     * Data found in BlockAdditional element of matroska container. There is
 +     * no end marker for the data, so it is required to rely on the side data
 +     * size to recognize the end. 8 byte id (as found in BlockAddId) followed
 +     * by data.
 +     */
 +    AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
 +
 +    /**
 +     * The optional first identifier line of a WebVTT cue.
 +     */
 +    AV_PKT_DATA_WEBVTT_IDENTIFIER,
 +
 +    /**
 +     * The optional settings (rendering instructions) that immediately
 +     * follow the timestamp specifier of a WebVTT cue.
 +     */
 +    AV_PKT_DATA_WEBVTT_SETTINGS,
 +
 +    /**
 +     * A list of zero terminated key/value strings. There is no end marker for
 +     * the list, so it is required to rely on the side data size to stop. This
 +     * side data includes updated metadata which appeared in the stream.
 +     */
 +    AV_PKT_DATA_METADATA_UPDATE,
  };
  
 +#define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS //DEPRECATED
 +
  typedef struct AVPacketSideData {
      uint8_t *data;
      int      size;

diff --cc libavcodec/utils.c
Simple merge