From 231ffb9243e5286b7c3d5806fa8f3142c72bfe15 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 3 Aug 2012 14:41:18 +0200 Subject: [PATCH] flvdec: follow packets backward until a valid last timestamp is found Fixed Ticket981 Signed-off-by: Michael Niedermayer --- libavformat/flvdec.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index fb356b801b..2c342bbddb 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -748,15 +748,22 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) if(s->pb->seekable && (!s->duration || s->duration==AV_NOPTS_VALUE) && !flv->searched_for_end){ int size; const int64_t pos= avio_tell(s->pb); - const int64_t fsize= avio_size(s->pb); + int64_t fsize= avio_size(s->pb); +retry_duration: avio_seek(s->pb, fsize-4, SEEK_SET); size= avio_rb32(s->pb); avio_seek(s->pb, fsize-3-size, SEEK_SET); if(size == avio_rb24(s->pb) + 11){ uint32_t ts = avio_rb24(s->pb); ts |= avio_r8(s->pb) << 24; - s->duration = ts * (int64_t)AV_TIME_BASE / 1000; + if(ts) + s->duration = ts * (int64_t)AV_TIME_BASE / 1000; + else if (fsize >= 8 && fsize - 8 >= size){ + fsize -= size+4; + goto retry_duration; + } } + avio_seek(s->pb, pos, SEEK_SET); flv->searched_for_end = 1; }