[FFmpeg-cvslog] probe: Fix insane flow control.

Alex Converse git at videolan.org
Sat Jul 30 06:55:34 CEST 2011


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Thu Jul 28 18:53:19 2011 -0700| [5ef953e84f0a272396bf11d7b780dec6c0e3ac00] | committer: Alex Converse

probe: Fix insane flow control.

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ef953e84f0a272396bf11d7b780dec6c0e3ac00
---

 libavformat/utils.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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) {



More information about the ffmpeg-cvslog mailing list