flvdec: disable new midstream param change code not only for h264 but all cases.

[ffmpeg] / libavformat / flvenc.c

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 2384e81276046036c9f3f17388e4fd39ee4a7339..3f034bc31a52b5a1e7c4d4779f862800167f0904 100644 (file)
--- 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;
         }