virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases 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>
This commit is contained in:
Reimar Döffinger 2012-08-05 09:41:20 +02:00
parent f5f98727b3
commit a4163b2d65
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

@ -526,9 +526,10 @@ static int ogg_get_length(AVFormatContext *s)
avio_seek (s->pb, s->data_offset, SEEK_SET); avio_seek (s->pb, s->data_offset, SEEK_SET);
ogg_reset(s); ogg_reset(s);
i = -1; i = -1;
while (!ogg_packet(s, &i, NULL, NULL, NULL)) { while (streams_left > 0 && !ogg_packet(s, &i, NULL, NULL, NULL)) {
if(i>=0) { int64_t pts;
int64_t pts = ogg_calc_pts(s, i, NULL); 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){ if (pts != AV_NOPTS_VALUE && s->streams[i]->start_time == AV_NOPTS_VALUE && !ogg->streams[i].got_start){
s->streams[i]->duration -= pts; s->streams[i]->duration -= pts;
ogg->streams[i].got_start= 1; ogg->streams[i].got_start= 1;
@ -537,9 +538,6 @@ static int ogg_get_length(AVFormatContext *s)
ogg->streams[i].got_start= 1; ogg->streams[i].got_start= 1;
streams_left--; streams_left--;
} }
}
if(streams_left<=0)
break;
} }
ogg_restore (s, 0); ogg_restore (s, 0);