Continue after guids in asf after which other guids are possible instead of skiping

over the stored size.
Fixes issue2029

Originally committed as revision 23732 to svn://svn.ffmpeg.org/ffmpeg/trunk
oldabi
Michael Niedermayer 15 years ago
parent 20843f51e7
commit 1d4c1c3b7a
  1. 2
      libavformat/asfdec.c

@ -519,11 +519,13 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
// there could be a optional stream properties object to follow // there could be a optional stream properties object to follow
// if so the next iteration will pick it up // if so the next iteration will pick it up
continue;
} else if (!guidcmp(&g, &ff_asf_head1_guid)) { } else if (!guidcmp(&g, &ff_asf_head1_guid)) {
int v1, v2; int v1, v2;
get_guid(pb, &g); get_guid(pb, &g);
v1 = get_le32(pb); v1 = get_le32(pb);
v2 = get_le16(pb); v2 = get_le16(pb);
continue;
} else if (!guidcmp(&g, &ff_asf_marker_header)) { } else if (!guidcmp(&g, &ff_asf_marker_header)) {
int i, count, name_len; int i, count, name_len;
char name[1024]; char name[1024];

Loading…
Cancel
Save