From 5ef5501b71c3046302494d1f1fa45e9af3ea7a7a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 3 Dec 2007 08:27:04 +0000 Subject: ensure that the probe code runs in O(n) Originally committed as revision 11147 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mp3.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavformat/mp3.c') diff --git a/libavformat/mp3.c b/libavformat/mp3.c index 39cb60d579..f99f5206b3 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -405,7 +405,7 @@ static int mp3_read_probe(AVProbeData *p) buf = p->buf; end = buf + p->buf_size - sizeof(uint32_t); - for(; buf < end; buf++) { + for(; buf < end; buf= buf2+1) { buf2 = buf; for(frames = 0; buf2 < end; frames++) { @@ -418,8 +418,6 @@ static int mp3_read_probe(AVProbeData *p) max_frames = FFMAX(max_frames, frames); if(buf == p->buf) first_frames= frames; - if(buf2 > end) - break; } if (first_frames>=3) return AVPROBE_SCORE_MAX/2+1; else if(max_frames>=3) return AVPROBE_SCORE_MAX/4; -- cgit v1.2.3