RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Storsjö 2012-07-05 09:47:29 +03:00
parent bb58c43c69
commit e43f56b205
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/flvdec.c
View File

@ -113,11 +113,7 @@ static int flv_same_audio_codec(AVCodecContext *acodec, int flags)
case FLV_CODECID_MP3: case FLV_CODECID_MP3:
return acodec->codec_id == CODEC_ID_MP3; return acodec->codec_id == CODEC_ID_MP3;
case FLV_CODECID_NELLYMOSER_8KHZ_MONO: case FLV_CODECID_NELLYMOSER_8KHZ_MONO:
return acodec->sample_rate == 8000 &&
acodec->codec_id == CODEC_ID_NELLYMOSER;
case FLV_CODECID_NELLYMOSER_16KHZ_MONO: case FLV_CODECID_NELLYMOSER_16KHZ_MONO:
return acodec->sample_rate == 16000 &&
acodec->codec_id == CODEC_ID_NELLYMOSER;
case FLV_CODECID_NELLYMOSER: case FLV_CODECID_NELLYMOSER:
return acodec->codec_id == CODEC_ID_NELLYMOSER; return acodec->codec_id == CODEC_ID_NELLYMOSER;
case FLV_CODECID_PCM_MULAW: case FLV_CODECID_PCM_MULAW: