From cefe0607dd751b58d08e7dca4a0c381e917f30d9 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 22 May 2005 08:47:09 +0000
Subject: [PATCH] av_find_stream_info() end check fixes 10l (wrong time base)
use timestamps if duration isnt available
Originally committed as revision 4301 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/utils.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9927cfca667..9791cc26869 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1797,7 +1797,7 @@ int av_find_stream_info(AVFormatContext *ic)
if (pkt->duration != 0)
st->codec_info_nb_frames++;
- if(st->codec.codec_type == CODEC_TYPE_VIDEO){
+ {
int index= pkt->stream_index;
int64_t last= last_dts[index];
int64_t duration= pkt->dts - last;
@@ -1811,6 +1811,8 @@ int av_find_stream_info(AVFormatContext *ic)
duration_sum[index] += duration;
duration_count[index]+= factor;
}
+ if(st->codec_info_nb_frames == 0)
+ st->codec_info_duration += duration;
}
last_dts[pkt->stream_index]= pkt->dts;
}
@@ -1835,7 +1837,7 @@ 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->codec_info_duration >= MAX_STREAM_DURATION) {
+ if (av_rescale_q(st->codec_info_duration, st->time_base, AV_TIME_BASE_Q) >= MAX_STREAM_DURATION) {
break;
}
count++;
--
GitLab