Merge commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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)
-    {
+        return AV_CODEC_ID_SOL_DPCM;
-        if (type & SOL_16BIT) return AV_CODEC_ID_SOL_DPCM;
+
-        else if (magic == 0x0C8D) return AV_CODEC_ID_SOL_DPCM;
+    if (magic == 0x0B8D)
-        else return AV_CODEC_ID_SOL_DPCM;
+        return AV_CODEC_ID_PCM_U8;
-    }
+
-    if (type & SOL_16BIT) return AV_CODEC_ID_PCM_S16LE;
+    if (type & SOL_16BIT)
+        return AV_CODEC_ID_PCM_S16LE;
+
     return AV_CODEC_ID_PCM_U8;
 }