diff options
| author | Thierry Foucu <tfoucu@gmail.com> | 2010-11-03 20:12:07 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-11-03 20:12:07 +0000 |
| commit | caa7ad5dc68a9b287a49f1d34f557274d3feee9c (patch) | |
| tree | 8ee4c5715185dd81d70be04ae08b05501370c6b9 | |
| parent | 20fcd0797e15e1acd9e75da55e748e44dd6497f7 (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
| -rw-r--r-- | libavformat/flv.h | 1 | ||||
| -rw-r--r-- | libavformat/flvdec.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/flv.h b/libavformat/flv.h index 55266a16e3..5d2666d28c 100644 --- a/libavformat/flv.h +++ b/libavformat/flv.h @@ -75,6 +75,7 @@ enum { FLV_CODECID_ADPCM = 1 << FLV_AUDIO_CODECID_OFFSET, FLV_CODECID_MP3 = 2 << FLV_AUDIO_CODECID_OFFSET, FLV_CODECID_PCM_LE = 3 << FLV_AUDIO_CODECID_OFFSET, + FLV_CODECID_NELLYMOSER_16KHZ_MONO = 4 << FLV_AUDIO_CODECID_OFFSET, FLV_CODECID_NELLYMOSER_8KHZ_MONO = 5 << FLV_AUDIO_CODECID_OFFSET, FLV_CODECID_NELLYMOSER = 6 << FLV_AUDIO_CODECID_OFFSET, FLV_CODECID_AAC = 10<< FLV_AUDIO_CODECID_OFFSET, 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; |