summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-10-24 18:36:26 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-10-24 18:36:26 +0000
commitf96d0eef53485202b3c4c8e4d973567c83dcf851 (patch)
tree8cf9e9d1462d1e8a831f521d69f458f7986519ab
parent4fe8a45240a26164c274c877fda5a900b7e8ab87 (diff)
force sample rate to 16khz for speex in flv, fix speexaudio.flv
Originally committed as revision 15678 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/flvdec.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 41e6a0bf22..b51c72ee14 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