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

Merge commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa' 

* commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa':
  libx264: Make sure the extradata are padded

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-27 12:48:27 +01:00
parent 368e521646 1ec72c6c68
commit e7a57d4873
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/libx264.c
View File

@ -795,7 +795,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
int nnal, s, i; int nnal, s, i;
s = x264_encoder_headers(x4->enc, &nal, &nnal); s = x264_encoder_headers(x4->enc, &nal, &nnal);
avctx->extradata = p = av_malloc(s); avctx->extradata = p = av_mallocz(s + AV_INPUT_BUFFER_PADDING_SIZE);
if (!p) if (!p)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);