[SCM] libav/experimental: Fix Speex header parsing in ogg demuxer

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6e6abd0237dc669d9f35f151251e361031343c1e
Author: David Conrad <lessen42 at gmail.com>
Date:   Sat Mar 21 08:22:09 2009 +0000

    Fix Speex header parsing in ogg demuxer
    
    Originally committed as revision 18101 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index eb7709c..19789e0 100644
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -36,9 +36,10 @@ static int speex_header(AVFormatContext *s, int idx) {
     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 *s, int idx) {
 
     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 = {

-- 
Libav/FFmpeg packaging