projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
20843f5
)
Continue after guids in asf after which other guids are possible instead of skiping
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 23 Jun 2010 02:04:55 +0000
(
02:04
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 23 Jun 2010 02:04:55 +0000
(
02:04
+0000)
over the stored size.
Fixes issue2029
Originally committed as revision 23732 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/asfdec.c
patch
|
blob
|
history
diff --git
a/libavformat/asfdec.c
b/libavformat/asfdec.c
index
b3533d1
..
eb14146
100644
(file)
--- 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];