diff options
| author | Alex Converse <alex.converse@gmail.com> | 2011-07-28 18:53:19 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2011-07-29 09:29:44 -0700 |
| commit | 5ef953e84f0a272396bf11d7b780dec6c0e3ac00 (patch) | |
| tree | 7a7b98bc2a967951fbe5a62179407934eb0cbfc9 /libavformat/utils.c | |
| parent | 298c4e3c522a1bc43cb557efe2e443be2ee80bb5 (diff) | |
| download | ffmpeg-5ef953e84f0a272396bf11d7b780dec6c0e3ac00.tar.gz | |
probe: Fix insane flow control.
A loop control variable was shadowed inside the loop and never updated.
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 1ecbd61ff7..c4d7623c8c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -501,9 +501,9 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt, return AVERROR(EINVAL); } - for(probe_size= PROBE_BUF_MIN; probe_size<=max_probe_size && !*fmt && ret >= 0; + for(probe_size= PROBE_BUF_MIN; probe_size<=max_probe_size && !*fmt; probe_size = FFMIN(probe_size<<1, FFMAX(max_probe_size, probe_size+1))) { - int ret, score = probe_size < max_probe_size ? AVPROBE_SCORE_MAX/4 : 0; + int score = probe_size < max_probe_size ? AVPROBE_SCORE_MAX/4 : 0; int buf_offset = (probe_size == PROBE_BUF_MIN) ? 0 : probe_size>>1; if (probe_size < offset) { |