mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'
* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7': h264_mp4toannexb_bsf: return a padded buffer Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9f91e7deec
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user