generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oggdec: simplify start time calculation code.

Browse Source 
Also slightly more correct behaviour in case streams_left for
some reason is 0 from the start.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit a4163b2d6583396845e06b1b976c3a981eb8cb1c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Reimar Döffinger 2012-08-05 09:41:20 +02:00 committed by Michael Niedermayer
parent 606538df6c
commit 5231a35559
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/oggdec.c
View File

@ -525,9 +525,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;
@ -536,9 +537,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);