diff options
| author | Martin Storsjö <martin@martin.st> | 2012-07-05 09:47:29 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-07-05 22:07:45 +0300 |
| commit | e43f56b205a6112451bba3da965f327850bf67a9 (patch) | |
| tree | 6c700336f4dbe61068c707f96313806bf88ee848 | |
| parent | bb58c43c69078c6cf29a9efee12e14469e2c21f8 (diff) | |
| download | ffmpeg-e43f56b205a6112451bba3da965f327850bf67a9.tar.gz | |
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@martin.st>
| -rw-r--r-- | libavformat/flvdec.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 602cb9ebee..12c250437a 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: |