force sample rate to 16khz for speex in flv, fix speexaudio.flv

Originally committed as revision 15678 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago · f96d0eef53
parent 4fe8a45240
commit f96d0eef53
1 changed files with 4 additions and 1 deletions
--- 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