From: Alex Converse <alex.converse@gmail.com>
Date: Fri, 29 Jul 2011 01:53:19 +0000 (-0700)
Subject: probe: Fix insane flow control.
X-Git-Tag: v0.8b1~1883
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ef953e84f0a272396bf11d7b780dec6c0e3ac00;p=platform%2Fupstream%2Flibav.git

probe: Fix insane flow control.

A loop control variable was shadowed inside the loop and never updated.
---

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1ecbd61..c4d7623 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) {