Commit 4fecf170 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '30b8eb0f'

* commit '30b8eb0f':
  sol: simplify sol_codec_id()
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents bcaef717 30b8eb0f
......@@ -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;
}
......
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