diff options
| author | Martin Storsjö <martin@martin.st> | 2011-12-15 15:10:57 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-12-15 16:53:54 +0200 |
| commit | bd2ff1a8bc01668b66314c20494c839f774de38e (patch) | |
| tree | 6f0b45b34f90badf57e936126dd72fa601adaee9 /libavformat/flvenc.c | |
| parent | 055c61b857eef8174fa71789d43c65b311b8d659 (diff) | |
| download | ffmpeg-bd2ff1a8bc01668b66314c20494c839f774de38e.tar.gz | |
flvenc: Support muxing 16 kHz nellymoser
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/flvenc.c')
| -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 dfa17e0374..623bea701e 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -90,6 +90,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){ @@ -125,6 +126,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; } |