[FFmpeg-cvslog] ff_gen_search: fix infinite loop
Michael Niedermayer
git at videolan.org
Tue Jun 18 22:59:21 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 18 20:50:15 2013 +0200| [f8ca8138f01d0a7d96d4e1ea65fecd1197f96206] | committer: Michael Niedermayer
ff_gen_search: fix infinite loop
Fixes Ticket2639
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8ca8138f01d0a7d96d4e1ea65fecd1197f96206
---
libavformat/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 686374d..ce92af6 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1778,7 +1778,7 @@ int64_t ff_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts,
pos_max = FFMAX(0, pos_max - step);
ts_max = ff_read_timestamp(s, stream_index, &pos_max, limit, read_timestamp);
step += step;
- }while(ts_max == AV_NOPTS_VALUE && pos_max > 0);
+ }while(ts_max == AV_NOPTS_VALUE && 2*limit > step);
if (ts_max == AV_NOPTS_VALUE)
return -1;
More information about the ffmpeg-cvslog
mailing list