summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2012-01-25 14:34:21 -0800
committerAlex Converse <alex.converse@gmail.com>2012-01-25 14:46:06 -0800
commitd2ee8c17793201ce969afd1f433ba1580c143cd2 (patch)
tree168919001ab05849c11027547cebba01b29df81f /libavformat/matroskadec.c
parent8801fac365549a43a639e239faba409d8f91ef86 (diff)
downloadffmpeg-d2ee8c17793201ce969afd1f433ba1580c143cd2.tar.gz
matroskadec: Pad AAC extradata.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index e5fbd43266..5b919449f5 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1440,7 +1440,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
} else if (codec_id == CODEC_ID_AAC && !track->codec_priv.size) {
int profile = matroska_aac_profile(track->codec_id);
int sri = matroska_aac_sri(track->audio.samplerate);
- extradata = av_malloc(5);
+ extradata = av_mallocz(5 + FF_INPUT_BUFFER_PADDING_SIZE);
if (extradata == NULL)
return AVERROR(ENOMEM);
extradata[0] = (profile << 3) | ((sri&0x0E) >> 1);