ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This fixes roundup issue 2556.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e4f85b8499)
This commit is contained in:
Peter Ross 2011-02-05 12:10:10 +11:00 committed by Michael Niedermayer
parent 3c90abf40f
commit 699d55fb12
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/wtv.c
View File

@ -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);