generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: compute probe buffer size more reliably.

Browse Source 
The previous code computes the offset by reversing the growth
of the allocated buffer size: it is complex and did lead to
inconsistencies when the size limit is reached.

Fix trac ticket #1991.
(cherry picked from commit 03847eb8259291b4ff1bd840bd779d0699d71f96)

Conflicts:
	libavformat/utils.c
(cherry picked from commit e74cd2f4706f71da5e9205003c1d8263b54ed3fb)
This commit is contained in:
Nicolas George 2012-12-04 19:49:51 +01:00 committed by Carl Eugen Hoyos
parent b06903e6c5
commit d3835cb877
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/utils.c
View File

@ -460,7 +460,7 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
{ {
AVProbeData pd = { filename ? filename : "", NULL, -offset }; AVProbeData pd = { filename ? filename : "", NULL, -offset };
unsigned char *buf = NULL; unsigned char *buf = NULL;
int ret = 0, probe_size; int ret = 0, probe_size, buf_offset = 0;
if (!max_probe_size) { if (!max_probe_size) {
max_probe_size = PROBE_BUF_MAX; max_probe_size = PROBE_BUF_MAX;
@ -500,7 +500,7 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
score = 0; score = 0;
ret = 0; /* error was end of file, nothing read */ ret = 0; /* error was end of file, nothing read */
} }
pd.buf_size += ret; pd.buf_size = buf_offset += ret;
pd.buf = &buf[offset]; pd.buf = &buf[offset];
memset(pd.buf + pd.buf_size, 0, AVPROBE_PADDING_SIZE); memset(pd.buf + pd.buf_size, 0, AVPROBE_PADDING_SIZE);