Merge commit '9e80eda2'

* commit '9e80eda2':
  h264_mp4toannexb_bsf: return a padded buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/h264_mp4toannexb_bsf.c

@@ -40,7 +40,7 @@ static int alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size,
     void *tmp;
 
     *poutbuf_size += sps_pps_size + in_size + nal_header_size;
-    tmp = av_realloc(*poutbuf, *poutbuf_size);
+    tmp = av_realloc(*poutbuf, *poutbuf_size + FF_INPUT_BUFFER_PADDING_SIZE);
     if (!tmp)
         return AVERROR(ENOMEM);
     *poutbuf = tmp;