Commit 93cc2014 authored by bcoudurier's avatar bcoudurier

move max analyze duration check before considering new packet

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18051 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 050adcdd
...@@ -2137,8 +2137,11 @@ int av_find_stream_info(AVFormatContext *ic) ...@@ -2137,8 +2137,11 @@ int av_find_stream_info(AVFormatContext *ic)
read_size += pkt->size; read_size += pkt->size;
st = ic->streams[pkt->stream_index]; 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; codec_info_duration[st->index] += pkt->duration;
}
if (pkt->duration != 0) if (pkt->duration != 0)
codec_info_nb_frames[st->index]++; codec_info_nb_frames[st->index]++;
...@@ -2199,9 +2202,6 @@ int av_find_stream_info(AVFormatContext *ic) ...@@ -2199,9 +2202,6 @@ int av_find_stream_info(AVFormatContext *ic)
(st->codec->codec_id == CODEC_ID_MPEG4 && !st->need_parsing))*/) (st->codec->codec_id == CODEC_ID_MPEG4 && !st->need_parsing))*/)
try_decode_frame(st, pkt->data, pkt->size); 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++; count++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment