summaryrefslogtreecommitdiff
path: root/libavformat/oggparsevorbis.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-05 01:41:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-05 01:52:21 +0200
commit441dce21699f5780a7d9309451149ab876d641dc (patch)
treef8d373f9bef87ed52e12ddfe182e909bc5ac41b3 /libavformat/oggparsevorbis.c
parentbce42e95d13e3cc9c32bcd75d127c0152e51471d (diff)
oggvorbis: move handling of first packets ts from parser to muxer.
The parser does not have enough knowledge it seems to do it correctly. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparsevorbis.c')
-rw-r--r--libavformat/oggparsevorbis.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 02da12799d..fa03ed752e 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -323,7 +323,7 @@ static int vorbis_packet(AVFormatContext *s, int idx)
}
next_pkt += os->segments[seg];
}
- os->lastpts = os->lastdts = os->granule - duration;
+ os->lastpts = os->lastdts = os->granule - FFMIN(duration, os->granule);
if(s->streams[idx]->start_time == AV_NOPTS_VALUE) {
s->streams[idx]->start_time = os->lastpts;
if (s->streams[idx]->duration)