From patchwork Sat Mar 23 02:06:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47359 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp286156pzb; Fri, 22 Mar 2024 19:08:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW4TNTydq3ICPtRPGJf/29NZRgc3rY86xuTHQ2pOBxgaQ7G5+DKejvhqo3g5C/05gWN3ouEWfjO6IRd5rl3Kbf4w4kNl+v4JBfoXg== X-Google-Smtp-Source: AGHT+IHKHx3nc6qd2RTn6P9hkt5KFnrIW3KoHVHYpTm0wlgL1oQ/zmpvriOktbUZVXI6UOvu6BGP X-Received: by 2002:a50:a69e:0:b0:56b:c210:870c with SMTP id e30-20020a50a69e000000b0056bc210870cmr710298edc.15.1711159690350; Fri, 22 Mar 2024 19:08:10 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g20-20020a50ee14000000b00566e2d8715bsi356780eds.527.2024.03.22.19.08.09; Fri, 22 Mar 2024 19:08:10 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="I7NtX5/1"; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADAD868D605; Sat, 23 Mar 2024 04:06:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2050.outbound.protection.outlook.com [40.92.74.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8484468D5E1 for ; Sat, 23 Mar 2024 04:06:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ls/J4PBAKsQK8eL2CeexTF4vLctsJaFuu7zHy9DpnE2pAVpe7kWm3Q8rjtXW+SU470B3Dib0bPIXHLK+W/sx442WovtBmTrh/BYllS+RN1mzEZSTlyQQxNmWNYtS/msQvpJtqTS0uT9Mfv5ynJ50Y2PuUfODdwY50EyCkD7vZFQQj9KE3qaC3KRXCJx/IyZLkdK3UPKThAhhHF+y12ojVaCoIaGHcHyV1VUWqZ6fkXeU1EJ6yOZscaR6dqn2nam7J3rtZ9m6Kn1DfZbUvlEnEYHnXJlMNYWHCF7n5CSCVekL2PK0kfRhEvNyBUpkC5uR0IXJeRL+zRV5gz+YndtX/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0RtaIL1Ih+3ETSswCxym4UYMoTYPSh6cU4wGRGGyiPY=; b=kB+MDT+Re8d3P0MmG2mFDyS7PHlgclVeOa9sS9BMinMuOPJZXyQ05NEYep+d+yxitDSXVe2HOkrkgCxbdlAboxY2wpXCLmOFDa9a/Ann1TDikeinq+Zd5NtbZsOpwbdN/oLr7/IUcSAcghJs6uFn9MQV5YhoaSakiNs5/KlSn+oUhte0n8tPa0nmVVdswFasPcX6R+ruXDh8vcKvs5ATQueTya8ZDvgRaLAmGUn4ASx0m8wENJbf91cNEj5akW943ufgZZ0A/nCTD1VHVt4pgzBXM36AwfWzH//Y38qyG7wHjQLf9L9BhpGwbiT2H095XfVLZySssWJQRtZKQv7JaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0RtaIL1Ih+3ETSswCxym4UYMoTYPSh6cU4wGRGGyiPY=; b=I7NtX5/129xVEwgKaiFBdmqxLoE+vFyU9fnlkYoBIkIMr+W1iscUrKanB1zbkODoJkY6unQjuaI/kzc9Al064psZyYBoHRjXKm7gbUFQ7dMBIPDmhGm3d6WsJM7QephIjPlI2fOv+s5fH8yhSQUjDC0awp+lDMuBJWwzazL94trBzBpOCC7VVjqp9hGljnBB5C8PmJzYSBkdPWct/EvgT9hm2y0kaRjMg/By0sNGYjzBjrUMCwmr4yas+Lr2yI/9ESKrRRJD4r0VP3NHmITeest5t/1sAf5HHqGAiZDIjdpg1DVZKw559p+kXfLv8lsQOeT/j6uI/lQt0tOwFlu6aw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0137.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:320::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.24; Sat, 23 Mar 2024 02:06:45 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7386.025; Sat, 23 Mar 2024 02:06:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 03:06:21 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [eUkDWij/v9pNCLIEh3bC9RfkHM3A/vFQi99PJyQDh1I=] X-ClientProxiedBy: ZR0P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::15) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240323020623.1570961-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0137:EE_ X-MS-Office365-Filtering-Correlation-Id: 3082a93c-a8da-4ca1-7e21-08dc4adde3f7 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqkjmXb1vlddM5aSa/Epk3Azfj4ZJduqG8fnG35xIgtIthaNc9rcN8CWtqhvlOnEfEzOy0iFBvDFwkJFO4uYkRTc+IKCddiHkLmr2saeAmkpdDsEclZ1sGGws0HkT1xXF66UjB6bm/fLul6x9EVu43vmvKWZbELS7GULpCsFOJHRmsDYkrbVzPnmOFsGgDvyKFaQVYlXUNvfVx+QPwrhjEEyjH/AJ8C9wdekiZmIfgEXwJDI7VWANkTIKkbuc0g0eZOqjwr1qURmsrJNf5DEdSNjmvptms1+Q2BS8hGWQ7K3gFjHVml23w2+17fyUzIS6Pw4PYaoOiyXJoN3T3xEEq8ct2pJl1x/7V5JxABJlnpAv9wz1CbDICQWpD9Oep4Y2idQxVMk63HbMHWTmEKhYYNJp+BMMi+mkXLybuNoXKwxfh8uvZNLPYDWv1CFwMiPNJDtMzDyvrhdXZveMab3FCa2VoOBchG9hDb29EN5lBQx0OAIuFjZTmQHGkfzBf38Xh7w66CX73Yi084Z2sdGqfQ02xjViUULxbrkbK+2gkZve17KPeoTqvV0dLFLw4fv8eJkzjq0AfWHhY1Ia28ezHL7RTq1UYPzapIVT6JrcT03lq55SeRccOn360uYAlIf3IUuo5OREdrWdFjACFf1Bd39ap2SZEumCqULLGUG6YCvnOSoFclWd7aUBiAEZ8b2chs3oZP0IsGgzRfOZPI6SyoVDdgVR4mBtRsPoRdbsmooYvY3+cleaOwv3QqGvSSHlU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YMTjWXRszIKmRKlpZB9FGC8gK+siWGFCr2DunWSm6e93SYqy3WhYym2GUMjKMoGyZQHRCExz4pHnK0pxGeVmUaUgV75ePxvHRNBKUgVBRnh9olLFelVHVZZTVmRb9FPHoLZ6qsbtzH8NuhyR77vGC8hLcgin53P2hYE9KiahmWEcPVp7AQTpZYvV13wndrrPiRfQW0CsPp/UnO2YgZfiYBTGAaJ85lnKbBDaSjJdM99GjEsgimfISBe7P6uHzIOVpMxcQ9sY6XONXS9WW1a9zXNcYiOtkrIoqV+dX5Td4cXrCG+GfjJqVhlYsfPt5igMjMW58Yxu8r3000wZPSGxwShR86OI2mI4j258VKt6ZC8xRv+TWCrml8d/beoshrpOnwA7MohVBDjrua3N28aD2AvyMvnalnU6v7q0wQ3Od1VMHQY9bZXyaFlkEeBVPmM2m80iWkCC+1vm6R1w8QaDE2WC3y4O5rjK8ee7J1gw6Kt+zz1aNRrFhZj2R3nU5sFtUjAx3khaAcCapOpKuYi6+2VcpxEiWsjCAh0WsjpRo0grikPU7FZWT5mskmfyYe+Lzk23N5nj/yeeXKqQrnWkaaDhDKBBuW+B5L3euSi/XRY5JwD9jE0jndCX8pWXbGMD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mzCXVACavXChiTrrTT4enycOzT/aC3V4/oUNwtWjhuub7k9BQ5JNwn+zWl3GiEDh1LvRou3SC5d21s2TP3OKU6zgWJIcjDDUx48yebN/IpCxZUcUqptvfjJkoqO6PexoYuPI8Myd7IWPTdgkhJC9FefBKiFr9GnDE7ligk9JA9uSBdlcXdQj15c6M0OY4REld2/6AHQPvYLOk5JdNb1dMtORuGYguYvOl1InXc8zH/tbgUh4Zk6nJ0GbitHdOlvvgq0Gs3GIwwh4Dhy9H4p94fi0lykef5SUMceJs5hGgr8+9tx4tWx/9/WV0ffMjiq82LulAtUFfiXeFILLvY2w172HW+62zBEmr8oPjRGIp4dPIdh+dK1BG/TK+spzuWcAm2+6vQl1MgqXPVtbT05e4RFRA/UVUyRAKbNTORciyu1n74bEXnvc3YZ/lgMOTCOE82GHjZ50wt4M+xzH2zPF1fI+sDBFeOKGExP62gfAIjSbaMQWlG/dKkFKz3jstj0L+bg1ttY3iYi8VWPcVeIEVt7g4jeV5RwobzQ7POQnsFcjhogLrnrpcdB/3D/3lt1b6KEBs0uXQxnQR7aBDeA7OgsF1VH962qY0HpULh+u2YbmJTyvIWKVrMSuiJbD1EzScecYpQ+jaKVgnUSEJkWPOYVgvCOctKsoy1xv1M4szDUcLCuepajVWc/yuXQXb1Ox/WEy0Dg8QgdD2jgzKp4ofWYUNwftw0vYC72Tgp6KKvRG+Ent8voRvzystKU5Hgi0pweCVK4CjyN7Sw202X1WgWEIa0Con28eaBxkVhIWxjaLY3XeL4xDI86+qJpAcuFhoY5PiNYbGcxGCKYCZphVbalfgN9tg9AQb1m8sW2aUyUJuRQWOI5hkOi3Vfo9/Ej1emNZsYr1pCj8T1yl5JL/KjFtcmfYb4+FhHVkuK0egnEXVDJ39JWDucQ+C1BLaRlLpyOO4miRp+W6pz65vvn4XbrAQCCHbekMLy0nCEoiSK09CPS9a3JpHstLEP9pvibQIkLElaCeMai1GrwAuiIote0VzrW05OX6R36mn21PggUonsXCXL7UABGSXGPaCTzUhjS9NB242t+wEFnTT5PDQH8p2jqXsmVTK5hdnqBKE7BiS4wk7DWjSXsmCgjAjUalsqeqrKe/OH7DzgLBnUUNDUOY7jrn8+YHgqBLk+vKa3KFPw/I9528LWckhTkjoXqCGLye6EIMoxowuC8GEw8xKBBCd6O425RP+DYKdJ7iF0+MkgAfhseCTCa/TriAjisL/GJ+BSvtj4B042HPf7kIeg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3082a93c-a8da-4ca1-7e21-08dc4adde3f7 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2024 02:06:45.4612 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0137 Subject: [FFmpeg-devel] [PATCH 13/15] avformat/pcmdec: Reindent after the previous commit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /vWccHsJyWvY Signed-off-by: Andreas Rheinhardt --- 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);