asfdec: fix seeking with fragmented packets
authorJanne Grunau <janne-libav@jannau.net>
Tue, 11 Feb 2014 12:01:38 +0000 (13:01 +0100)
committerJanne Grunau <janne-libav@jannau.net>
Wed, 12 Feb 2014 11:52:28 +0000 (12:52 +0100)
After seeking fragments with an offset > 0 must be skipped to correctly
assemble packets.

Bug-Id: 43

libavformat/asfdec.c

index 8580ce0..28a403a 100644 (file)
@@ -1103,6 +1103,16 @@ static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
         asf_st = asf->asf_st;
         av_assert0(asf_st);
 
+        if (!asf_st->frag_offset && asf->packet_frag_offset) {
+            av_dlog(s, "skipping asf data pkt with fragment offset for "
+                    "stream:%d, expected:%d but got %d from pkt)\n",
+                    asf->stream_index, asf_st->frag_offset,
+                    asf->packet_frag_offset);
+            avio_skip(pb, asf->packet_frag_size);
+            asf->packet_size_left -= asf->packet_frag_size;
+            continue;
+        }
+
         if (asf->packet_replic_size == 1) {
             // frag_offset is here used as the beginning timestamp
             asf->packet_frag_timestamp = asf->packet_time_start;