From: Alexandra Hájková <alexandra.khirnova@gmail.com>
Date: Thu, 23 Jul 2015 10:33:37 +0000 (+0200)
Subject: asfdec: do not align Data Object when Broadcast Flag is set
X-Git-Tag: android-x86-7.1-r1~252^2~2160
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b5c1c16247ab7d166c84eaf4564e49a1535fdaaf;p=android-x86%2Fexternal-ffmpeg.git

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>
---

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;
     }