[FFmpeg-cvslog] r20093 - trunk/libavformat/oggdec.c

reimar subversion
Wed Sep 30 11:46:48 CEST 2009


Author: reimar
Date: Wed Sep 30 11:46:48 2009
New Revision: 20093

Log:
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.

Modified:
   trunk/libavformat/oggdec.c

Modified: trunk/libavformat/oggdec.c
==============================================================================
--- trunk/libavformat/oggdec.c	Wed Sep 30 11:43:56 2009	(r20092)
+++ trunk/libavformat/oggdec.c	Wed Sep 30 11:46:48 2009	(r20093)
@@ -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);
 



More information about the ffmpeg-cvslog mailing list