diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 12:48:27 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 12:48:27 +0100 |
| commit | e7a57d4873e1123b9a42c4f8d7aefb4b1e8f1b61 (patch) | |
| tree | 7180c6fa334c42e4c5bc921f9d1e1a1aad4f1d1c /libavcodec | |
| parent | 368e5216464fd894ded93e8a3fc12066c1a9c061 (diff) | |
| parent | 1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa (diff) | |
| download | ffmpeg-e7a57d4873e1123b9a42c4f8d7aefb4b1e8f1b61.tar.gz | |
Merge commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa'
* commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa':
libx264: Make sure the extradata are padded
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index cc79250d0f..4949860428 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -795,7 +795,7 @@ FF_ENABLE_DEPRECATION_WARNINGS int nnal, s, i; 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) return AVERROR(ENOMEM); |