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

Merge commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b' 

* commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b':
  sol: simplify sol_codec_id()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-24 13:09:49 +01:00
parent bcaef717ec 30b8eb0f87
commit 4fecf170d7
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/sol.c
View File

@ -50,18 +50,15 @@ static int sol_probe(AVProbeData *p)
static enum AVCodecID sol_codec_id(int magic, int type)
{
if (magic == 0x0B8D)
{
if (type & SOL_DPCM) return AV_CODEC_ID_SOL_DPCM;
else return AV_CODEC_ID_PCM_U8;
}
if (type & SOL_DPCM)
{
if (type & SOL_16BIT) return AV_CODEC_ID_SOL_DPCM;
else if (magic == 0x0C8D) return AV_CODEC_ID_SOL_DPCM;
else return AV_CODEC_ID_SOL_DPCM;
}
if (type & SOL_16BIT) return AV_CODEC_ID_PCM_S16LE;
return AV_CODEC_ID_SOL_DPCM;
if (magic == 0x0B8D)
return AV_CODEC_ID_PCM_U8;
if (type & SOL_16BIT)
return AV_CODEC_ID_PCM_S16LE;
return AV_CODEC_ID_PCM_U8;
}