[FFmpeg-cvslog] flvdec: Treat all nellymoser versions as the same codec

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Jul  5 09:47:29 2012 +0300| [e43f56b205a6112451bba3da965f327850bf67a9] | committer: Martin Storsjö

flvdec: Treat all nellymoser versions as the same codec

This avoids creating new AVStreams for them when switching between
different variants of them, since we can handle changes between
different sample rates of nellymoser within the same stream.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e43f56b205a6112451bba3da965f327850bf67a9
---

 libavformat/flvdec.c |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 602cb9e..12c2504 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -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: