sol: simplify sol_codec_id()

Bug-Id: CID 1238993

sol: simplify sol_codec_id()
Bug-Id: CID 1238993
30b8eb0f · Vittorio Giovara · b99ca863 · 30b8eb0f
Commit 30b8eb0f authored Nov 21, 2014 by Vittorio Giovara
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 11 deletions

sol.c libavformat/sol.c +8 -11

No files found.
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -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;
 }