Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 13/15] avformat/pcmdec: Reindent after the previous commit
Date: Sat, 23 Mar 2024 03:06:21 +0100
Message-ID: <GV1P250MB073737092C5E6D56115F23E68F302@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <GV1P250MB07376CBB2E248FDF0C78CF8C8F302@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/pcmdec.c | 52 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index 03feefb5bb..e95a08df4b 100644
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -51,33 +51,33 @@ static int pcm_handle_mime_type(AVFormatContext *s, const char *prefix,
     if (!av_stristart(mime_type, prefix, &options)) /* audio/L16 */
         goto end;
 
-            while (options = strchr(options, ';')) {
-                options++;
-                if (!rate)
-                    sscanf(options, " rate=%d",     &rate);
-                if (!channels)
-                    sscanf(options, " channels=%d", &channels);
-                if (!little_endian) {
-                     char val[sizeof("little-endian")];
-                     if (sscanf(options, " endianness=%13s", val) == 1) {
-                         little_endian = strcmp(val, "little-endian") == 0;
-                     }
-                }
+    while (options = strchr(options, ';')) {
+        options++;
+        if (!rate)
+            sscanf(options, " rate=%d",     &rate);
+        if (!channels)
+            sscanf(options, " channels=%d", &channels);
+        if (!little_endian) {
+            char val[sizeof("little-endian")];
+            if (sscanf(options, " endianness=%13s", val) == 1) {
+                little_endian = strcmp(val, "little-endian") == 0;
             }
-            if (rate <= 0) {
-                av_log(s, AV_LOG_ERROR,
-                       "Invalid sample_rate found in mime_type \"%s\"\n",
-                       mime_type);
-                av_freep(&mime_type);
-                return AVERROR_INVALIDDATA;
-            }
-            par->sample_rate = rate;
-            if (channels > 0) {
-                av_channel_layout_uninit(&par->ch_layout);
-                par->ch_layout.nb_channels = channels;
-            }
-            if (little_endian)
-                par->codec_id = AV_CODEC_ID_PCM_S16LE;
+        }
+    }
+    if (rate <= 0) {
+        av_log(s, AV_LOG_ERROR,
+               "Invalid sample_rate found in mime_type \"%s\"\n",
+               mime_type);
+        av_freep(&mime_type);
+        return AVERROR_INVALIDDATA;
+    }
+    par->sample_rate = rate;
+    if (channels > 0) {
+        av_channel_layout_uninit(&par->ch_layout);
+        par->ch_layout.nb_channels = channels;
+    }
+    if (little_endian)
+        par->codec_id = AV_CODEC_ID_PCM_S16LE;
 
 end:
     av_freep(&mime_type);
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  parent reply	other threads:[~2024-03-23  2:08 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-23  2:03 [FFmpeg-devel] [PATCH 01/15] configure: Make hls demuxer select AAC, AC3 and EAC3 demuxers Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 02/15] avformat/hls: Don't access FFInputFormat.raw_codec_id Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 03/15] avformat/fitsdec: Don't use AVBPrint for temporary storage Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 04/15] avformat/g722: Inline constants Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 05/15] avformat/wvedec: Inline constant Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 06/15] avformat/fsb: Don't set data_offset manually Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 07/15] avformat/avr: Combine skips Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 08/15] avformat/wady: " Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 09/15] avformat/argo_cvg: Avoid relocations for ArgoCVGOverride Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 10/15] avformat/lafdec: Fix shadowing Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 11/15] avformat/cdg: Don't store avio_size() return value in int Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 12/15] avformat/pcmdec: Avoid av_freep(&(void*){NULL}) Andreas Rheinhardt
2024-03-23  2:06 ` Andreas Rheinhardt [this message]
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 14/15] avformat/vqf: Return 0 on success in read_packet Andreas Rheinhardt
2024-03-23  2:06 ` [FFmpeg-devel] [PATCH 15/15] avformat/internal: Move FF_FMT_INIT_CLEANUP to demux.h Andreas Rheinhardt
2024-03-25  1:54 ` [FFmpeg-devel] [PATCH 01/15] configure: Make hls demuxer select AAC, AC3 and EAC3 demuxers Andreas Rheinhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=GV1P250MB073737092C5E6D56115F23E68F302@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM \
    --to=andreas.rheinhardt@outlook.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git