aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-06-23 02:04:55 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-06-23 02:04:55 +0000
commit1d4c1c3b7a1aae1b1be7109af56c23bb1ff2c1a8 (patch)
tree9f2c3e39396b91f5e73713a92cdd2341498860bd /libavformat
parent20843f51e7f6652a7aa65f2b1afa5e961ad948ff (diff)
downloadffmpeg-1d4c1c3b7a1aae1b1be7109af56c23bb1ff2c1a8.tar.gz
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
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/asfdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index b3533d1ee1..eb14146829 100644
--- a/libavformat/asfdec.c
+++ b/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
// if so the next iteration will pick it up
+ continue;
} else if (!guidcmp(&g, &ff_asf_head1_guid)) {
int v1, v2;
get_guid(pb, &g);
v1 = get_le32(pb);
v2 = get_le16(pb);
+ continue;
} else if (!guidcmp(&g, &ff_asf_marker_header)) {
int i, count, name_len;
char name[1024];