[FFmpeg-cvslog] r18101 - trunk/libavformat/oggparsespeex.c

[conrad]

Author: conrad
Date: Sat Mar 21 09:22:09 2009
New Revision: 18101

Log:
Fix Speex header parsing in ogg demuxer

Modified:
   trunk/libavformat/oggparsespeex.c

Modified: trunk/libavformat/oggparsespeex.c
==============================================================================
--- trunk/libavformat/oggparsespeex.c	Sat Mar 21 09:03:30 2009	(r18100)
+++ trunk/libavformat/oggparsespeex.c	Sat Mar 21 09:22:09 2009	(r18101)
@@ -36,9 +36,10 @@ static int speex_header(AVFormatContext 
     AVStream *st = s->streams[idx];
     uint8_t *p = os->buf + os->pstart;
 
-    if (os->psize < 80)
-        return 1;
+    if (os->seq > 1)
+        return 0;
 
+    if (os->seq == 0) {
     st->codec->codec_type = CODEC_TYPE_AUDIO;
     st->codec->codec_id = CODEC_ID_SPEEX;
 
@@ -50,8 +51,10 @@ static int speex_header(AVFormatContext 
 
     st->time_base.num = 1;
     st->time_base.den = st->codec->sample_rate;
+    } else
+        vorbis_comment(s, p, os->psize);
 
-    return 0;
+    return 1;
 }
 
 const struct ogg_codec ff_speex_codec = {