From: Peter Ross <pross@xvid.org>
Date: Sat, 5 Feb 2011 01:10:10 +0000 (+1100)
Subject: wtv: do not use flag in stream_guid chunk to determine if stream is valid, as this... 
X-Git-Tag: android-x86-4.4-r1~12310^2~2323
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e4f85b849913794395bb03dfc09546cd41b10882;p=android-x86%2Fexternal-ffmpeg.git

wtv: do not use flag in stream_guid chunk to determine if stream is valid, as this method is unreliable

This fixes roundup issue 2556.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
---

diff --git a/libavformat/wtv.c b/libavformat/wtv.c
index e0881d3bf5..c10d9ec3e7 100644
--- a/libavformat/wtv.c
+++ b/libavformat/wtv.c
@@ -783,18 +783,14 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p
             if (ff_find_stream_index(s, sid) < 0) {
                 ff_asf_guid mediatype, subtype, formattype;
                 int size;
-                consumed += 20;
-                url_fskip(pb, 16);
-                if (get_le32(pb)) {
-                    url_fskip(pb, 8);
+                    url_fskip(pb, 28);
                     ff_get_guid(pb, &mediatype);
                     ff_get_guid(pb, &subtype);
                     url_fskip(pb, 12);
                     ff_get_guid(pb, &formattype);
                     size = get_le32(pb);
                     parse_media_type(s, 0, sid, mediatype, subtype, formattype, size);
-                    consumed += 72 + size;
-                }
+                    consumed += 92 + size;
             }
         } else if (!ff_guidcmp(g, stream2_guid)) {
             int stream_index = ff_find_stream_index(s, sid);