ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

sol: simplify sol_codec_id()

Browse Source 
Bug-Id: CID 1238993
This commit is contained in:
Vittorio Giovara 2014-11-21 12:57:35 +00:00
parent b99ca86350
commit 30b8eb0f87
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;
}