From 45a7b0674dba25295e439b50797e5231ad16b3b7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 5 May 2012 10:48:08 +0200 Subject: [PATCH] oggvorbis: fix the first 2 packets timestamps matching issue Signed-off-by: Michael Niedermayer --- libavformat/oggparsevorbis.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index fa03ed752e..28de6bd8e1 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -323,9 +323,9 @@ static int vorbis_packet(AVFormatContext *s, int idx) } next_pkt += os->segments[seg]; } - os->lastpts = os->lastdts = os->granule - FFMIN(duration, os->granule); + os->lastpts = os->lastdts = os->granule - duration; if(s->streams[idx]->start_time == AV_NOPTS_VALUE) { - s->streams[idx]->start_time = os->lastpts; + s->streams[idx]->start_time = FFMAX(os->lastpts, 0); if (s->streams[idx]->duration) s->streams[idx]->duration -= s->streams[idx]->start_time; }