git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7f25050
)
oggparseskeleton: avoid header parsing failure
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 6 Jul 2013 21:53:19 +0000
(23:53 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 6 Jul 2013 21:53:19 +0000
(23:53 +0200)
Based on description by James Almer and the xiph wiki
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/oggparseskeleton.c
patch
|
blob
|
history
diff --git
a/libavformat/oggparseskeleton.c
b/libavformat/oggparseskeleton.c
index
b012105
..
d94b0c2
100644
(file)
--- a/
libavformat/oggparseskeleton.c
+++ b/
libavformat/oggparseskeleton.c
@@
-37,6
+37,9
@@
static int skeleton_header(AVFormatContext *s, int idx)
strcpy(st->codec->codec_name, "skeleton");
st->codec->codec_type = AVMEDIA_TYPE_DATA;
strcpy(st->codec->codec_name, "skeleton");
st->codec->codec_type = AVMEDIA_TYPE_DATA;
+ if ((os->flags & OGG_FLAG_EOS) && os->psize == 0)
+ return 1;
+
if (os->psize < 8)
return -1;
if (os->psize < 8)
return -1;