virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ffserver: add missing padding to extradata.

Browse Source
This commit is contained in:
Clément Bœsch 2012-12-30 22:19:51 +01:00
parent 36e61e24e7
commit 9db5f82032
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffserver.c
View File

@ -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)
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;