From patchwork Sat Jul 22 19:11:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42911 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp1012062pzb; Sat, 22 Jul 2023 12:11:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlGQWpF77LhRy0Pk+ZmmbLF5NZM5bNPOnC42+Cz07+K1f7EPWBmRZ7xt+/BZqznCuQeicWBs X-Received: by 2002:a05:6402:516c:b0:521:942a:f2b7 with SMTP id d12-20020a056402516c00b00521942af2b7mr4417714ede.28.1690053074025; Sat, 22 Jul 2023 12:11:14 -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 h14-20020a50ed8e000000b0051e29447e4fsi3873462edr.548.2023.07.22.12.11.12; Sat, 22 Jul 2023 12:11:14 -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=JtnpW3yE; 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 5E38968C675; Sat, 22 Jul 2023 22:10:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2020.outbound.protection.outlook.com [40.92.73.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A3C868C19A for ; Sat, 22 Jul 2023 22:10:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P5CYKZpzo32czH2spMeGhP72IL4FPW4lFH4CqFEWyoUVHxHK6csOvK+G3CEbzBJiXU92XC/D1F64/ELGIor4hnz4TpPQNjprcaIUBEhURCRGyTgJwcwKXTlqB4q1MKzAjM9TjIp6iIKF7xNS09JkuXn2yEzb6kTbkkGnFhl/TLmj0k8WAyIfDR6xFNfStOaJuoPZMDOvC4d7MqhYvQuE+mZ9ZBBsWLlNAJwr71f3eNKdQRlGXS+XGFnxRYTbKWI7K1yUraHCyUCT8GMWRysKfXP0mHE/HGV/eP9kTEsUIc4IvQFICIeoiqLRr9CL8BW2m2dCDno78Z09KHADx9J7lQ== 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=Km3RnvlTjxoiqjx9tt9Na03Ik1nl1wOLtr39QHr+zDQ=; b=CUEoQ459/rr5WClq05fojyr96U7gEr6yra/7pQ4MCvR2b+1ulAuXuYMOSN+oDI6wmPY9LxI3ZpZoCIO0SCRBFQysn5AelI83g9oaxy6Bugc9V/eFwai4YZzTx6vfo2lG5noAWUQK9o2VL/cg2nTbKcCRRtJPvG8g7vAMEj2+Kvo5/hG3eEYcam/HAsHT55gXcsSiOHJRldplWQx3xz44bfFRgBCcZG1kSZCgv/hqsD4nly5dv87O3558dEeBfl1+GldtIEC3DZ1UHxZ99q9MvPckFKJxVNrV/+LBsjjl1QFD/unEWhCt/AqY5IwkB7X/zab6UQCwbzuO+lZSgvPEjQ== 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=Km3RnvlTjxoiqjx9tt9Na03Ik1nl1wOLtr39QHr+zDQ=; b=JtnpW3yEhujCMc74FERNmhZyJ1SMCJ4duqRkSescICqzFqUcZVCHSui35lCj1E7YHg0/K8shGNx5uBiXThCBfqvss8zkuTQKMEjDn2N9EzGplY95Sxcy5Sn7ZyfspgvQtyJ20gU+A+W1CnQMRBzHCRzZTwHWXFpkFJcwgBmFe9JhrF6Vm4ogUaEJl8NvjDrq44uH4gGyqc8MOgz8iRPUATLefb+WtHltQ8MuFNq08vkp0SDt1lUuldVQqRuHoMMDLPMRSEmJ5Ztu2cvro7S7p3MpBQQJkf5IBx0c9AX8+TC8eZtZY8E5s9rOPJV1AdFfHwW2CiW9FeBneGYjF3pc/A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0218.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:379::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.30; Sat, 22 Jul 2023 19:10:37 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6609.029; Sat, 22 Jul 2023 19:10:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jul 2023 21:11:30 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [/j1ycaKSSWRM5vq+oqyh3h5nsQP8JRzj] X-ClientProxiedBy: ZR2P278CA0049.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230722191130.1251075-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0218:EE_ X-MS-Office365-Filtering-Correlation-Id: c74d479d-5215-4c1d-927e-08db8ae754d7 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKy3M6SAHU+5RV9SgJexg5ijYmzvsN0ME6SlxuVjhj4BgrsQilEcn9cQgAV7xdqxO5MerKF/hjIWst2Qnmut/g5s7Wj/aT270WF8pFaMOoLq83/Dyotm+gHryEhZzuTMo2h1k/lEyH7UKnXBN+fhle7x+gkOcB6c8uXWeiwLnoyqHNBxWCGj/gdl0FYRmk4cKskp1UuwgRPPs7Jw8dUnZGjd+AC5FPlvJv5yflkkbdOX7jT9EVL0q5ybhV1/0Va/0XgZaueYoBEmKPMyvieqRoLtg/RJ7GlZnJT1sEWDTz1u2pMo0ts2vNGxI93s/Bxyck2zvWfqzjwIxE6VW6EMKbXGqc+k5BZBESJW7/dkCphlShACHKYXb938peIUsvNb1YZuCghpW6nfSf0mRVPiBBI11NCRP55WqqBI34UfvYPthBcwNu5KqDKP8A3C7OuQresbhsQaRiSyjkyrSPvv1OmMr/xbU4rhN6soBi+Q0UluHg0cTMcedB89y9yYa/qsQ+GMlxaUU/o6s21HvYgt9yu1DCoW342t4n+N28KJUVN3mkf3ITKrKAw1s3tvuOKC2BKiAcOWMWtYG73/zGlPNAmpuZB4LKps79ywqgDFy2dIt4nkvJ4WMe/3OSW01x7bN8cvi8oTCvNwyH7wCnXGCosO2UhrpXIiySJKKL2bXyAIir7UfzJOrzcUBCA5nMisHglpHKQbDv/nOrYzgc2tqiNixEeZblWkNpc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9EJa6wgVvqnM2I7Wdt4vRI4m1h6JoSMUM5bICNxDQE5OJlq86C95N4lHHsTYcukyu7JFtgn9YGNf2iaeaZHl+frGVpL9J0hrguFShsuC5ANnBgcPZTm9mMHI0q4MG42A1I252M2qPuEmWgeVACDcY5IXgLZAureMEPVsbusvNiiZgqmb2lp/2p/7DW/JnPd9HctNj+pLCX7QMFfdQCiJX1ZCDSmngORAF+9f7wyl2+GqXqTaVekTNUyotJzlWMenf/gM1C+b2KMel8kkto1Vs9LHklOjEijJalLcCc6yjZXLFgCMdaDxiMTn0B7IV0TVwcavXNmNEnFpbOvBQmJMB1aUYCdAGzBv0t/SStcBFPP3ksGfu3l+9S01K2Ea5a6QD/wE73Y6kMZuYefMRHJquiQb6FFYnHri302DMr7vPxjdSOb31kYUQuc3/NQH0FJDm5hIsJy3Zehz3QkyaX3rdy5uSwgUEmtq9vLE503PpiVQIsq7O9a7MWxmgN/lnq4L95cfSsrmFp6BQmq80Goj7iokP1O8OmXfurWvsk4VdSBr24FoWa6Vm+OTTx7/5b64EvqN0Kpsou2yJ1Qez+GQoBFekZl092kO+LKxropBWhPi/jWo1Fkr5DLI4NElQCxs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Gt9es6EpzOR7GNXfEYfOdyCeuJYYAWqUZjQqLycKbOP40/WoVAZW4sWqVWnxipTweTlKR3jPfFcfc2wAyl4fxFxGU0XB63Yho453zBAjaCRAwW93x+uRXbPV+aCvEF5zJV29WSeG5mWO5krkJgHyg1X6HMXnTTSp5K9mMsV5d+l1ygyCYl10i6Ht0cLagUGOpUMi8/d/qdjdu7wyVsaoeP6TJlCaY8euUppAqyDd60Zk/tMNdZD+7CsBA6HvaYsq0OjB/0n70qOA8SGaOhLzQTIOK0L+QPSeA6SlSaLb3P0qkutPZx6yz83medINdUXDLT7/cRteApT4N0pt8bhg2IFBJ+rVR9CtT6++F410XIjL1gn6QwE0RFVWauhnmniAuTIJYrSpQVdo3/kMZ388VhKcBmZIhwau0M99gVutXUDPceCUT/cKMBeyI3GlNX4FfRIiyFX+3rfHajGE2T6ySA9hHndPHpMkmgW/SxppAo8M3kSc9arEfGDhOHQUB6OQAB2cWeYq24sAmVvhu7JgZReWYor5m+7biIqFbcsC6iH5QQA8kld7pD4BMqVq4I5k4sKwFiQsUOPftk14M/dVixhosKagycSA66i9YRiFOXj2tXy/cA50ZzIicYTdxy1wCH1buVYI3sawWFl9XGdbp+ITxxYvt0MbRKlXVIUX/5UCZIm95ecrPS3fVPSSosykcqmJQgDBu63xbDAbHYTWPa8lWe0Clfqc2UDQUe6AMNHXrQFL/V6CsRoeq8p3B/gW0gLhneZjxfAMjOHmZF/bF05tB0hFzzbeRKevmE201Fy0QqA0j/gzCUFGJOUlWLnpJLugyrr53n+a6qsbzM2oqi8HgAGkxd0XZIV7sq2y0RHgNiUu3UrIr6PPYkZnz8I/LI3aJuwSf7LZF6F9NYCNqTWEfa0Teumt48MdLhCV3+SkTImCMMoXCvTidJxxC7YlLnW+jhCaQTRrHnAjs0sCUIxCbRINgzvTr/ty8DXPhC4HaSaSflsBeej8xF8w3j3sab/w0pS/nqd4prwqzBDz32K2/aUX0IDc5l93oD9eOSQPBB5liriOUFH2H07ulFXUyjXcqIliOwo7SaFOHZ3JYMKEHKkN0dDKyU+JOeu738e0Bl3tDvRgxKnJ7V/B9F8MLp+RlOf3glePkuxpzKSxoZdOMSTfVdLzkpNYmPA3uOQMx+MaWpRpRW0HyL8u7Xw/Ca8Br3wmy2Wk2yJoZSVXtHtdCnVLWgf439ytXt+/UT7la9DTxiMt17Tm3fFkWu2d X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c74d479d-5215-4c1d-927e-08db8ae754d7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2023 19:10:37.1495 (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: AS8P250MB0218 Subject: [FFmpeg-devel] [PATCH 5/5] fftools/ffmpeg_opt: Reduce scope of variables for deprecated code 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: qr2SntHdwXOI Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 1860e9d329..dc6044120a 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -372,9 +372,6 @@ static int opt_map(void *optctx, const char *opt, const char *arg) StreamMap *m = NULL; int i, negative = 0, file_idx, disabled = 0; int ret; -#if FFMPEG_OPT_MAP_SYNC - char *sync; -#endif char *map, *p; char *allow_unused; @@ -387,10 +384,14 @@ static int opt_map(void *optctx, const char *opt, const char *arg) return AVERROR(ENOMEM); #if FFMPEG_OPT_MAP_SYNC - /* parse sync stream first, just pick first matching stream */ - if (sync = strchr(map, ',')) { - *sync = 0; - av_log(NULL, AV_LOG_WARNING, "Specifying a sync stream is deprecated and has no effect\n"); + { + /* parse sync stream first, just pick first matching stream */ + char *sync = strchr(map, ','); + + if (sync) { + *sync = 0; + av_log(NULL, AV_LOG_WARNING, "Specifying a sync stream is deprecated and has no effect\n"); + } } #endif