From 93cc201403f9751dcf2c8335a712e11c5f7513cd Mon Sep 17 00:00:00 2001 From: bcoudurier Date: Thu, 19 Mar 2009 21:54:34 +0000 Subject: [PATCH] move max analyze duration check before considering new packet git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18051 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- libavformat/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 7419cc662..18ca13e5e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2137,8 +2137,11 @@ int av_find_stream_info(AVFormatContext *ic) read_size += pkt->size; st = ic->streams[pkt->stream_index]; - if(codec_info_nb_frames[st->index]>1) + if(codec_info_nb_frames[st->index]>1) { + if (st->time_base.den > 0 && av_rescale_q(codec_info_duration[st->index], st->time_base, AV_TIME_BASE_Q) >= ic->max_analyze_duration) + break; codec_info_duration[st->index] += pkt->duration; + } if (pkt->duration != 0) codec_info_nb_frames[st->index]++; @@ -2199,9 +2202,6 @@ int av_find_stream_info(AVFormatContext *ic) (st->codec->codec_id == CODEC_ID_MPEG4 && !st->need_parsing))*/) try_decode_frame(st, pkt->data, pkt->size); - if (st->time_base.den > 0 && av_rescale_q(codec_info_duration[st->index], st->time_base, AV_TIME_BASE_Q) >= ic->max_analyze_duration) { - break; - } count++; } -- 2.39.2