summaryrefslogtreecommitdiff
authorClément Bœsch <ubitux@gmail.com>2012-12-30 21:19:51 (GMT)
committer Clément Bœsch <ubitux@gmail.com>2012-12-30 21:22:18 (GMT)
commit9db5f82032b1629f5587c18d3152098507a7da35 (patch)
tree6198dcbb2e1b404b3e993d71097e643fc6c496f7
parent36e61e24e7ac737b38c4382d439329352d9e0c29 (diff)
downloadffmpeg-9db5f82032b1629f5587c18d3152098507a7da35.zip
ffmpeg-9db5f82032b1629f5587c18d3152098507a7da35.tar.gz
ffmpeg-9db5f82032b1629f5587c18d3152098507a7da35.tar.bz2
ffserver: add missing padding to extradata.
Diffstat
-rw-r--r--ffserver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c
index d8627bd..f2cf67f 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3518,7 +3518,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop
fst->codec = avcodec_alloc_context3(NULL);
memcpy(fst->codec, codec, sizeof(AVCodecContext));
if (codec->extradata_size) {
- fst->codec->extradata = av_malloc(codec->extradata_size);
+ fst->codec->extradata = av_mallocz(codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
memcpy(fst->codec->extradata, codec->extradata,
codec->extradata_size);
}
@@ -3627,7 +3627,7 @@ static void extract_mpeg4_header(AVFormatContext *infile)
p[2] == 0x01 && p[3] == 0xb6) {
size = p - pkt.data;
// av_hex_dump_log(infile, AV_LOG_DEBUG, pkt.data, size);
- st->codec->extradata = av_malloc(size);
+ st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
st->codec->extradata_size = size;
memcpy(st->codec->extradata, pkt.data, size);
break;