flvdec: Treat all nellymoser versions as the same codec
[ffmpeg.git] / libavformat / flvdec.c
index 602cb9ebee1babe4e7fe0d34360387d7046513ca..12c250437a42b5c498250f078bdd2685b286529a 100644 (file)
@@ -113,11 +113,7 @@ static int flv_same_audio_codec(AVCodecContext *acodec, int flags)
     case FLV_CODECID_MP3:
         return acodec->codec_id == CODEC_ID_MP3;
     case FLV_CODECID_NELLYMOSER_8KHZ_MONO:
-        return acodec->sample_rate == 8000 &&
-               acodec->codec_id == CODEC_ID_NELLYMOSER;
     case FLV_CODECID_NELLYMOSER_16KHZ_MONO:
-        return acodec->sample_rate == 16000 &&
-               acodec->codec_id == CODEC_ID_NELLYMOSER;
     case FLV_CODECID_NELLYMOSER:
         return acodec->codec_id == CODEC_ID_NELLYMOSER;
     case FLV_CODECID_PCM_MULAW: