Commit 9db5f820 authored by Clément Bœsch's avatar Clément Bœsch

ffserver: add missing padding to extradata.

parent 36e61e24
...@@ -3518,7 +3518,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop ...@@ -3518,7 +3518,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop
fst->codec = avcodec_alloc_context3(NULL); fst->codec = avcodec_alloc_context3(NULL);
memcpy(fst->codec, codec, sizeof(AVCodecContext)); memcpy(fst->codec, codec, sizeof(AVCodecContext));
if (codec->extradata_size) { 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, memcpy(fst->codec->extradata, codec->extradata,
codec->extradata_size); codec->extradata_size);
} }
...@@ -3627,7 +3627,7 @@ static void extract_mpeg4_header(AVFormatContext *infile) ...@@ -3627,7 +3627,7 @@ static void extract_mpeg4_header(AVFormatContext *infile)
p[2] == 0x01 && p[3] == 0xb6) { p[2] == 0x01 && p[3] == 0xb6) {
size = p - pkt.data; size = p - pkt.data;
// av_hex_dump_log(infile, AV_LOG_DEBUG, pkt.data, size); // 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; st->codec->extradata_size = size;
memcpy(st->codec->extradata, pkt.data, size); memcpy(st->codec->extradata, pkt.data, size);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment