Commit e43f56b2 authored by Martin Storsjö's avatar Martin Storsjö
Browse files

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: default avatarMartin Storsjö <martin@martin.st>
parent bb58c43c
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment