diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 22:59:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:01:41 +0200 |
| commit | 9f91e7deecc16172cad1f2904704ed48ffb0e1b0 (patch) | |
| tree | 65eff49c2cfc224c37b3f3ee8679b895dbcc2889 /libavcodec/h264_mp4toannexb_bsf.c | |
| parent | 0a5d22a195b26d83dc823b041054b2a516a6c558 (diff) | |
| parent | 9e80eda26d06c7c48dbec5dfe643c857c62c0ee7 (diff) | |
| download | ffmpeg-streaming-9f91e7deecc16172cad1f2904704ed48ffb0e1b0.zip ffmpeg-streaming-9f91e7deecc16172cad1f2904704ed48ffb0e1b0.tar.gz | |
Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'
* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7':
h264_mp4toannexb_bsf: return a padded buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mp4toannexb_bsf.c')
| -rw-r--r-- | libavcodec/h264_mp4toannexb_bsf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c index a28859c..eeb67e4 100644 --- a/libavcodec/h264_mp4toannexb_bsf.c +++ b/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; |
