diff options
| author | Martin Storsjö <[email protected]> | 2011-12-15 15:10:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2012-01-03 18:23:17 +0100 |
| commit | 3f1e77a44c10b4468e7d5ac64fdc371fdeaf923a (patch) | |
| tree | 50a0d0b73a5fba51a270b062decca5bda30a73f5 | |
| parent | 923deca05f85e097e2607f22f195da28a89e97d9 (diff) | |
flvenc: Support muxing 16 kHz nellymoser
Signed-off-by: Martin Storsjö <[email protected]>
(cherry picked from commit bd2ff1a8bc01668b66314c20494c839f774de38e)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/flvenc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 2a223eeeb3..2f5aa28e6a 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -93,6 +93,7 @@ static int get_audio_flags(AVCodecContext *enc){ case 11025: flags |= FLV_SAMPLERATE_11025HZ; break; + case 16000: //nellymoser only case 8000: //nellymoser only case 5512: //not mp3 if(enc->codec_id != CODEC_ID_MP3){ @@ -128,6 +129,8 @@ static int get_audio_flags(AVCodecContext *enc){ case CODEC_ID_NELLYMOSER: if (enc->sample_rate == 8000) { flags |= FLV_CODECID_NELLYMOSER_8KHZ_MONO | FLV_SAMPLESSIZE_16BIT; + } else if (enc->sample_rate == 16000) { + flags |= FLV_CODECID_NELLYMOSER_16KHZ_MONO | FLV_SAMPLESSIZE_16BIT; } else { flags |= FLV_CODECID_NELLYMOSER | FLV_SAMPLESSIZE_16BIT; } |