1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00

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
This commit is contained in:
Reinhard Tartler
2010-02-09 18:24:30 +00:00
parent 1e9ac36f66
commit 95f90d27d2

View File

@ -477,12 +477,17 @@ static int
ogg_read_header (AVFormatContext * s, AVFormatParameters * ap) ogg_read_header (AVFormatContext * s, AVFormatParameters * ap)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
int i;
ogg->curidx = -1; ogg->curidx = -1;
//linear headers seek from start //linear headers seek from start
if (ogg_get_headers (s) < 0){ if (ogg_get_headers (s) < 0){
return -1; 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 //linear granulepos seek from end
ogg_get_length (s); ogg_get_length (s);