From 95f90d27d213fc3b9ca238a542728cd36a7583c7 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Tue, 9 Feb 2010 18:24:30 +0000 Subject: [PATCH] Disable parsing for ogg streams where no ogg header was found, if no header was found the parser was not initialized and thus will crash when trying to use it. Originally committed as revision 21708 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5 --- libavformat/oggdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 28dc56eeb9..54406f5479 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -477,12 +477,17 @@ static int ogg_read_header (AVFormatContext * s, AVFormatParameters * ap) { struct ogg *ogg = s->priv_data; + int i; ogg->curidx = -1; //linear headers seek from start if (ogg_get_headers (s) < 0){ return -1; } + for (i = 0; i < ogg->nstreams; i++) + if (ogg->streams[i].header < 0) + ogg->streams[i].codec = NULL; + //linear granulepos seek from end ogg_get_length (s);