summaryrefslogtreecommitdiff
path: root/libavformat/asfdec.c
diff options
context:
space:
mode:
authorAlexandra Hájková <alexandra.khirnova@gmail.com>2015-07-23 12:33:37 +0200
committerAnton Khirnov <anton@khirnov.net>2015-07-27 18:09:30 +0200
commitb5c1c16247ab7d166c84eaf4564e49a1535fdaaf (patch)
tree12d2f32cd7babb095c80eb4d51b39eb1d6f5cd37 /libavformat/asfdec.c
parentdb21dde3f72c2331653399bdb8745350f015d847 (diff)
asfdec: do not align Data Object when Broadcast Flag is set
its size is invalid in this case Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/asfdec.c')
-rw-r--r--libavformat/asfdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 9c746af075..37d91e0c75 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -928,7 +928,7 @@ static int asf_read_data(AVFormatContext *s, const GUIDParseTable *g)
size, asf->nb_packets);
avio_skip(pb, 2); // skip reserved field
asf->first_packet_offset = avio_tell(pb);
- if (pb->seekable)
+ if (pb->seekable && !(asf->b_flags & ASF_FLAG_BROADCAST))
align_position(pb, asf->offset, asf->data_size);
return 0;
@@ -1676,7 +1676,7 @@ static int asf_read_header(AVFormatContext *s)
size = avio_rl64(pb);
align_position(pb, asf->offset, size);
}
- if (asf->data_reached && !pb->seekable)
+ if (asf->data_reached && (!pb->seekable || (asf->b_flags & ASF_FLAG_BROADCAST)))
break;
}