speex in flv demuxing

Originally committed as revision 15028 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/flv.h b/libavformat/flv.h
index ed02191..938383e 100644 (file)
--- a/libavformat/flv.h
+++ b/libavformat/flv.h
@@ -78,6 +78,7 @@ enum {
     FLV_CODECID_NELLYMOSER_8HZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET,
     FLV_CODECID_NELLYMOSER          = 6 << FLV_AUDIO_CODECID_OFFSET,
     FLV_CODECID_AAC                 = 10<< FLV_AUDIO_CODECID_OFFSET,
+    FLV_CODECID_SPEEX               = 11<< FLV_AUDIO_CODECID_OFFSET,
 };
 
 enum {

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index d2e92b0..309aacc 100644 (file)
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -53,6 +53,7 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c
             acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16LE; break;
         case FLV_CODECID_AAC  : acodec->codec_id = CODEC_ID_AAC;                                    break;
         case FLV_CODECID_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF;                              break;
+        case FLV_CODECID_SPEEX: acodec->codec_id = CODEC_ID_SPEEX;                                  break;
         case FLV_CODECID_MP3  : acodec->codec_id = CODEC_ID_MP3      ; astream->need_parsing = AVSTREAM_PARSE_FULL; break;
         case FLV_CODECID_NELLYMOSER_8HZ_MONO:
             acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate