From 959d58fd98250e20e238f46da5a80c3fd5320a34 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward@centricular.com>
Date: Mon, 6 Jan 2025 14:46:24 +0100
Subject: [PATCH] libav/codecmap: Clarify fallthrough usages

And minor rewrite to avoid `return; break;` patterns

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8229>
---
 .../gst-libav/ext/libav/gstavcodecmap.c       | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/subprojects/gst-libav/ext/libav/gstavcodecmap.c b/subprojects/gst-libav/ext/libav/gstavcodecmap.c
index 8b9cfb308a..122b00965d 100644
--- a/subprojects/gst-libav/ext/libav/gstavcodecmap.c
+++ b/subprojects/gst-libav/ext/libav/gstavcodecmap.c
@@ -2924,6 +2924,8 @@ GstAudioFormat
 gst_ffmpeg_smpfmt_to_audioformat (enum AVSampleFormat sample_fmt,
     GstAudioLayout * layout)
 {
+  GstAudioFormat ret = GST_AUDIO_FORMAT_UNKNOWN;
+
   if (layout)
     *layout = GST_AUDIO_LAYOUT_NON_INTERLEAVED;
 
@@ -2931,42 +2933,48 @@ gst_ffmpeg_smpfmt_to_audioformat (enum AVSampleFormat sample_fmt,
     case AV_SAMPLE_FMT_U8:
       if (layout)
         *layout = GST_AUDIO_LAYOUT_INTERLEAVED;
+      /* FALLTHROUGH */
     case AV_SAMPLE_FMT_U8P:
-      return GST_AUDIO_FORMAT_U8;
+      ret = GST_AUDIO_FORMAT_U8;
       break;
 
     case AV_SAMPLE_FMT_S16:
       if (layout)
         *layout = GST_AUDIO_LAYOUT_INTERLEAVED;
+      /* FALLTHROUGH */
     case AV_SAMPLE_FMT_S16P:
-      return GST_AUDIO_FORMAT_S16;
+      ret = GST_AUDIO_FORMAT_S16;
       break;
 
     case AV_SAMPLE_FMT_S32:
       if (layout)
         *layout = GST_AUDIO_LAYOUT_INTERLEAVED;
+      /* FALLTHROUGH */
     case AV_SAMPLE_FMT_S32P:
-      return GST_AUDIO_FORMAT_S32;
+      ret = GST_AUDIO_FORMAT_S32;
       break;
+
     case AV_SAMPLE_FMT_FLT:
       if (layout)
         *layout = GST_AUDIO_LAYOUT_INTERLEAVED;
+      /* FALLTHROUGH */
     case AV_SAMPLE_FMT_FLTP:
-      return GST_AUDIO_FORMAT_F32;
+      ret = GST_AUDIO_FORMAT_F32;
       break;
 
     case AV_SAMPLE_FMT_DBL:
       if (layout)
         *layout = GST_AUDIO_LAYOUT_INTERLEAVED;
+      /* FALLTHROUGH */
     case AV_SAMPLE_FMT_DBLP:
-      return GST_AUDIO_FORMAT_F64;
+      ret = GST_AUDIO_FORMAT_F64;
       break;
 
     default:
-      /* .. */
-      return GST_AUDIO_FORMAT_UNKNOWN;
       break;
   }
+
+  return ret;
 }
 
 /* Convert a FFMPEG Sample Format and optional AVCodecContext