summaryrefslogtreecommitdiff
path: root/libavformat/flvdec.c
diff options
context:
space:
mode:
authorThierry Foucu <tfoucu@gmail.com>2010-11-03 20:12:07 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-11-03 20:12:07 +0000
commitcaa7ad5dc68a9b287a49f1d34f557274d3feee9c (patch)
tree8ee4c5715185dd81d70be04ae08b05501370c6b9 /libavformat/flvdec.c
parent20fcd0797e15e1acd9e75da55e748e44dd6497f7 (diff)
Fix 16kHz Mono NellyMoser in flv.
Patch by Thierry Foucu, tfoucu gmail Originally committed as revision 25667 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/flvdec.c')
-rw-r--r--libavformat/flvdec.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 063f9064f5..b3592611e9 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -68,6 +68,12 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c
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
+ acodec->codec_id = CODEC_ID_NELLYMOSER;
+ break;
+ case FLV_CODECID_NELLYMOSER_16KHZ_MONO:
+ acodec->sample_rate = 16000;
+ acodec->codec_id = CODEC_ID_NELLYMOSER;
+ break;
case FLV_CODECID_NELLYMOSER:
acodec->codec_id = CODEC_ID_NELLYMOSER;
break;