summaryrefslogtreecommitdiff
path: root/libavformat/asfdec.c
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2014-02-11 13:01:38 +0100
committerJanne Grunau <janne-libav@jannau.net>2014-02-12 12:52:28 +0100
commitf5d92d9cab07429b084c88262d9af1735ac8914a (patch)
tree90142e2a6390af6b9e1dff2f545a69208b6e4e39 /libavformat/asfdec.c
parent0c082565965258dca143767cc6cb25e38b6e9ea3 (diff)
asfdec: fix seeking with fragmented packets
After seeking fragments with an offset > 0 must be skipped to correctly assemble packets. Bug-Id: 43
Diffstat (limited to 'libavformat/asfdec.c')
-rw-r--r--libavformat/asfdec.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 8580ce0462..28a403aeb0 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -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;