summaryrefslogtreecommitdiff
path: root/libavformat/oggdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-08-24 23:20:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-08-24 23:20:09 +0200
commit7e7012d0b491453b8de8ca34846f9d48501dc6c5 (patch)
tree19a0bb59969f5b4d0d85bd2bc3a4e6eac77a9d4a /libavformat/oggdec.c
parentd2cab951e32d7688d41f475cd55475772c70dd39 (diff)
oggdec: subtract time of first packet only from duration when it is significant
this fixes accuracy with normal ogg files while keeping support for ogg files starting at times different from 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggdec.c')
-rw-r--r--libavformat/oggdec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 3d7c87f427..e8d4fc5355 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -493,8 +493,9 @@ static int ogg_get_length(AVFormatContext *s)
if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0 &&
ogg->streams[i].codec) {
if(s->streams[i]->duration && s->streams[i]->start_time == AV_NOPTS_VALUE && !ogg->streams[i].got_start){
- s->streams[i]->duration -=
- ogg_gptopts (s, i, ogg->streams[i].granule, NULL);
+ int64_t start= ogg_gptopts (s, i, ogg->streams[i].granule, NULL);
+ if(av_rescale_q(start, s->streams[i]->time_base, AV_TIME_BASE_Q) > AV_TIME_BASE)
+ s->streams[i]->duration -= start;
ogg->streams[i].got_start= 1;
streams_left--;
}