flvdec: follow packets backward until a valid last timestamp is found
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Aug 2012 12:41:18 +0000 (14:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Aug 2012 12:50:26 +0000 (14:50 +0200)
Fixed Ticket981

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flvdec.c

index fb356b8..2c342bb 100644 (file)
@@ -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;
     }