From a4163b2d6583396845e06b1b976c3a981eb8cb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Sun, 5 Aug 2012 09:41:20 +0200 Subject: oggdec: simplify start time calculation code. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also slightly more correct behaviour in case streams_left for some reason is 0 from the start. Signed-off-by: Reimar Döffinger --- libavformat/oggdec.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 0a4650158d..cb149ed63a 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -526,9 +526,10 @@ static int ogg_get_length(AVFormatContext *s) avio_seek (s->pb, s->data_offset, SEEK_SET); ogg_reset(s); i = -1; - while (!ogg_packet(s, &i, NULL, NULL, NULL)) { - if(i>=0) { - int64_t pts = ogg_calc_pts(s, i, NULL); + while (streams_left > 0 && !ogg_packet(s, &i, NULL, NULL, NULL)) { + int64_t pts; + if (i < 0) continue; + pts = ogg_calc_pts(s, i, NULL); if (pts != AV_NOPTS_VALUE && s->streams[i]->start_time == AV_NOPTS_VALUE && !ogg->streams[i].got_start){ s->streams[i]->duration -= pts; ogg->streams[i].got_start= 1; @@ -537,9 +538,6 @@ static int ogg_get_length(AVFormatContext *s) ogg->streams[i].got_start= 1; streams_left--; } - } - if(streams_left<=0) - break; } ogg_restore (s, 0); -- cgit v1.2.3