RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-28 10:13:22 +00:00
Code Issues Projects Releases Wiki Activity

oggdec: Fix duration calculation if the last page in a file has no granule

Browse Source 
Originally committed as revision 22890 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-04-16 12:21:35 +00:00
parent 49c2d29089
commit 44a088eab7
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/oggdec.c
View File

@ -431,7 +431,7 @@ static int
ogg_get_length (AVFormatContext * s) ogg_get_length (AVFormatContext * s)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
int idx = -1, i; int i;
int64_t size, end; int64_t size, end;
if(url_is_streamed(s->pb)) if(url_is_streamed(s->pb))
@ -451,15 +451,12 @@ ogg_get_length (AVFormatContext * s)
while (!ogg_read_page (s, &i)){ while (!ogg_read_page (s, &i)){
if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0 && if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0 &&
ogg->streams[i].codec) ogg->streams[i].codec) {
idx = i; s->streams[i]->duration =
} ogg_gptopts (s, i, ogg->streams[i].granule, NULL);
if (s->streams[i]->start_time != AV_NOPTS_VALUE)
if (idx != -1){ s->streams[i]->duration -= s->streams[i]->start_time;
s->streams[idx]->duration = }
ogg_gptopts (s, idx, ogg->streams[idx].granule, NULL);
if (s->streams[idx]->start_time != AV_NOPTS_VALUE)
s->streams[idx]->duration -= s->streams[idx]->start_time;
} }
ogg_restore (s, 0); ogg_restore (s, 0);