[FFmpeg-cvslog] matroskadec: Pad AAC extradata.

Alex Converse git at videolan.org
Thu Jan 26 17:46:31 CET 2012


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Wed Jan 25 14:34:21 2012 -0800| [5af569aa30b93f56344ea540936eb671760f568c] | committer: Michael Niedermayer

matroskadec: Pad AAC extradata.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

CC: libav-stable at libav.org
(cherry picked from commit d2ee8c17793201ce969afd1f433ba1580c143cd2)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5af569aa30b93f56344ea540936eb671760f568c
---

 libavformat/matroskadec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 600b1f4..80ff938 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1488,7 +1488,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);



More information about the ffmpeg-cvslog mailing list