RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7' 

* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7':
  h264_mp4toannexb_bsf: return a padded buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-16 22:59:59 +02:00
parent 0a5d22a195 9e80eda26d
commit 9f91e7deec
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264_mp4toannexb_bsf.c
View File

@ -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;