[SCM] libav/experimental: force sample rate to 16khz for speex in flv, fix speexaudio.flv

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f96d0eef53485202b3c4c8e4d973567c83dcf851
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Fri Oct 24 18:36:26 2008 +0000

    force sample rate to 16khz for speex in flv, fix speexaudio.flv
    
    Originally committed as revision 15678 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 41e6a0b..b51c72e 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -53,7 +53,10 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c
             acodec->codec_id = acodec->bits_per_coded_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_SPEEX:
+            acodec->codec_id = CODEC_ID_SPEEX;
+            acodec->sample_rate = 16000;
+            break;
         case FLV_CODECID_MP3  : acodec->codec_id = CODEC_ID_MP3      ; astream->need_parsing = AVSTREAM_PARSE_FULL; break;
         case FLV_CODECID_NELLYMOSER_8KHZ_MONO:
             acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate

-- 
Libav/FFmpeg packaging