Merge commit '31c51f7441de07b88cfea2550245bf1f5140cb8f'

* commit '31c51f7441de07b88cfea2550245bf1f5140cb8f':
  avpacket: add a function for wrapping existing data as side data

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

diff --cc doc/APIchanges
index 1d0a3d295a46bf7ec88c750f19b9178345dd39ba,0979930aacfff930df9e76e7e7c02149c3aa0b5b..265d6d548987fd9c5b3a37a6059fa3d4b3b827a9
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -14,10 -12,11 +14,13 @@@ libavutil:     2015-08-2
  
  
  API changes, most recent first:
 -
 -2015-xx-xx - xxxxxxx - lavc 57.11.0 - avcodec.h
++2015-12-17 - xxxxxxx - lavc 57.18.100 / 57.11.0 - avcodec.h
+   Add av_packet_add_side_data().
+ 
 -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
Simple merge

diff --cc libavcodec/avpacket.c
index 1cc10eba0549e49f03a1cd760c2a189510b2cb5f,f8268b9401a781f482b63b1c5d29f7fd66b8fe8e..cb1d44d4fb1059d52b8a4e75f1e53c4927e172ff
--- 1/libavcodec/avpacket.c
--- 2/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@@ -296,7 -255,29 +292,29 @@@ int av_packet_add_side_data(AVPacket *p
      pkt->side_data[elems].type = type;
      pkt->side_data_elems++;
  
-     return pkt->side_data[elems].data;
+     return 0;
+ }
+ 
+ 
+ uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                                  int size)
+ {
+     int ret;
+     uint8_t *data;
+ 
+     if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
+         return NULL;
 -    data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
++    data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+     if (!data)
+         return NULL;
+ 
+     ret = av_packet_add_side_data(pkt, type, data, size);
+     if (ret < 0) {
+         av_freep(&data);
+         return NULL;
+     }
+ 
+     return data;
  }
  
  uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,

diff --cc libavcodec/version.h
index 30278532634ecc3ccbdfc65073b938475e5b8fe7,0e42e6cbe4507d8090878a81c7dc790510afbd9b..6f88ee47bc60839f6aa92b66ccf881b6d674b1d7
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -28,9 -28,9 +28,9 @@@
  
  #include "libavutil/version.h"
  
 -#define LIBAVCODEC_VERSION_MAJOR 57
 -#define LIBAVCODEC_VERSION_MINOR 11
 -#define LIBAVCODEC_VERSION_MICRO  0
 +#define LIBAVCODEC_VERSION_MAJOR  57
- #define LIBAVCODEC_VERSION_MINOR  17
++#define LIBAVCODEC_VERSION_MINOR  18
 +#define LIBAVCODEC_VERSION_MICRO 100
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \