From patchwork Tue Aug 2 17:28:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37096 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp3276304pzb; Tue, 2 Aug 2022 10:29:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR6nXKcHHw/G4TX0iD1RVoMih65cRjlX/ALVEntR1PqWnNKD6nlzSR7EG6PFTKu+Qb87itLx X-Received: by 2002:a17:906:84f0:b0:730:a118:ad8e with SMTP id zp16-20020a17090684f000b00730a118ad8emr2900116ejb.522.1659461351756; Tue, 02 Aug 2022 10:29:11 -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 cs18-20020a170906dc9200b0073094a56feesi3576416ejc.546.2022.08.02.10.29.11; Tue, 02 Aug 2022 10:29:11 -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=rDEH1jTY; 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 A557F68B8F9; Tue, 2 Aug 2022 20:29:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2057.outbound.protection.outlook.com [40.92.91.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E61368B8F9 for ; Tue, 2 Aug 2022 20:29:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Plz2Ep54JnHep6jeWRBYS+hYE2OHcxzKFrqZgbY1kRJs3ALqg0zpguKLmFR+gxuyJg1YGeTVkdpgFSY4F/KwTz7EQxEz1zxfZPvHApoqRsKGEvoOsRjIWQwNxt+yNexDWJqytEITCLZwqW6O6htJepqia8S8ggSf7ciIk7qeEggJassrB+p66tOlH/2ppg3vmkMfZv9E+9OhEGROphOrdKHHfH3vCbqYcyl68sgS3AxEX4EGE2/DvSwJZqf36C4HIsnmHUeWyhfzne544AEqIRWfZ1iF7fWmUeX85ya4WhgOgOeJUqw3P1gmteypBf/P0vU5wh9iNJQKF7XJg6Ultw== 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=lxt/xTa7elC+nAFOOiJ4Ip6+djh5r8M7MJ8k/Fs0WmA=; b=fDLu6kc/nB4Io/aSR1m4NVIbSezxY8ie11w+XxGYSiYZx6EU+JRc9Qv3UiA+dSrok3KHRHqG17NJG4ghvBj4UD2BzaMHCc8oL49iFwbgFGIKe2bYoQBKpu9IOL7mUpso1jaMEtsZuXLV5VgdQtNxW60ws9F0aZEh9pJszbn2aeuEAST7XbjyXJiVRWQyQoCqBCJ02NBp6QAMgNA+M83y/RjY33KUO9UxZY8r3NZNYm+PYGbW4OQYR0XaGKjv2Yh1N6dBLhbE80kOlYWWM/Gn5ejzUSmknaGmsZZzPCZ6WfEiMpDr3VNDpNQcrm3GIljQwy4LimjaB3sI7MH0tMMiKQ== 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=lxt/xTa7elC+nAFOOiJ4Ip6+djh5r8M7MJ8k/Fs0WmA=; b=rDEH1jTYqHsnK7TzleuremTwkKrol5J7iDtC5fUV3/Ajmm7crUuC4RNLtuLQMVzHdGfLPE+NUzWyxGhCh/rq9ZbCrt4hHTsspefS8lHJzunWcOaUPETa0AsWt7dHL/Mpj2pH/aAw7An4nobCAkiOtnbdtqscR01T4hAmFtB1xnHlx6yLKHsQ0pTaSf5Au4nQhWWOPZCLdVAm8XoE1ZV0qLkdKx4RGTzV8SgaLTV/YRD/bVdSiBkckDOmNEAKwJMyTepLb1p9e+vE1FWBJ73W8wgS3qKJqTP/LbfsgPeRAyKzmXwnMrQfnb3pSbnuxh13Qq6INbcTmSYR1GavcoH0fQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB8PR01MB6453.eurprd01.prod.exchangelabs.com (2603:10a6:10:15e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.11; Tue, 2 Aug 2022 17:29:00 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5482.016; Tue, 2 Aug 2022 17:29:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Aug 2022 19:28:53 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [VFDeywV2Erlo5Pmab6F/rsM7wnVrUzCV] X-ClientProxiedBy: ZR0P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::7) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220802172853.1056096-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6142084f-fb12-412e-4acd-08da74ac7c8e X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKE76TYhWV/4KQLVhhexcEj0qnHlHj4qof59aAPcaXXJLMLM03y8CPqNXexi0COLm5gf7WTdjTZ3h4/gc5VghbvYYTUcLPxuHtU1LoTmrn+U2RHHEAfdVk2kWqHKLr2/80a9nswc162KZHjRFzZsUwK1iT5a+m/HgIjBGBEz087e4f3j8QSTV8bcNjqafQJgh8qX9B+PNYvx8mds8vYaqLfCyHSuVHEu/N1or46zvZstKs9qDKImfH6Xqv0Uh3avrsAIqiS/2ex35JVcM2wkDiOhx5ghdNd4Pw8Geohs8m+taWvYXmFp9651vdV9nk6ZeXAQ6tlyH8qYdRaJkwC56DycJOd8wOMtRsWgMIiTSplogG8rgnzgMZxufkQSVQHxIek57QYvRH6WPHTedcTPdtQVuerc0D7p9Zi1Joi4/W3WHbbQdQ5wgUdSVUb+fqkORIMtxshcYjnZYf+D13lxavMHPIGeDWEQyojbaFqMc0h1AL93dNMJ7Le7n3z9/Cr/+bR+arejnCoO5wNdt7k8V3W65LgHe5cmDzWlj67WDoitQuNasIaRByPfevJNpTCbrlL+KZSGYN39dFRu6oPLKyY41HEfZk1WLY2eH1Otn842ChNK4d79Xp2NvCOShqxK/xCaZsZcJLERYDe6yX/u82BJLZNJ4iKaxUbDPgAWcCwFJ/Lsb0jnwo/hBj+Ccq15XlOhJFUy0eDYg== X-MS-TrafficTypeDiagnostic: DB8PR01MB6453:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G39tPw65gwIAo6kG135aJHtL0chS6m2Fot3u+mNqI0psR/2jqzGIHDNmDDBvU/lWSy28n0So/CMJwLPmqJ7CU2QvJYdM3fcqrb7QwoMYA8TVxBbE923RufM+2Bf2ofVGAWz0owpSgKgVj9n80FXEQbhta/SUcCoIfs5fC3TSaNXu4hxeMBbcOLj5OnOgn7ApKIdkSdPcSO4ezv17ZFm4V5JQBbhqWqZiMLnDCHrOx393Qo4IrxZPFqiJRJHAcP0DNFtesapt3IIGesv/c429yHC7WOWGLGyqGhVWDD5KM+SnITVKZpin9cbNnK+ZFIkDQx1+fW8fC5OLecwGoqIAXhFw9V/BM0qVbC+2+UB+9IkckhjuHpqmqfLCD468Uee9ha2jX/s4mh43+bfHDQHzUHlTfxuWEf6iLc2ty3TqnqXQLBFMQW5RkKBiHbOwJTR+sZ6pgO8kDwSEQSv8JixTyHpkZI8mOzutCwYc7KAMBi9Fq00iKpS0b5QByKDloNXk/Z3FUMs40fZGsmxTTXCz+EoyIL1sGGthx0LLBvL9zlZs8Cw8KC95L3zR1FodLzHvthPcoTIU0y0+At+jGNAprlLdndpsWxKgTMs/kidVPG14xFN9yaTyawW0f5+8CwMbbOHmwu7aZZNvurcvTUzGnQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: akTpvrZS6YI7+9HCQ4DQD6moGRVNgixEayD3XB8mHMH2sffV1XJDQjwd5rourDtrcdPjJd4r9A1FENf284P3VrmqP4b8zjzj6t9ZMIk+3hXkMFo6OfPmNW8efJiGhfFzJA94SMyQqyHdhknv6CwiN50h6va5csjO4g5ZoZFzUl9tVjOrVctPWTxjSvHPdrGgKrBjRdZi9oPIrcwRt4+/gN4SWU86T0LBxp6unDAyYXUgI2Ra3G2PxAyHHzEZCEWM2k1U/iPpUeq+M8KLBEHnipeT9oEBl8pK4/+czDqnwP4FysXxgp/SAe6Y7AmrdzXH68sSviljd7GOgmmm16fqLPrhJUyPmWuWk1K1tloSuJxrAjmX7cZPyfJ9dRXNvKcHSIbrKQUiHfmtDIcRPS+m5gIDExRN0RnITROi7AC50RbmR3pDzyRtyY80mbtcd8vnc/qVCHtypNBi3olWvH6kokbAXvLSntnMZXGtW7AcFpRyAKEXILZZR3EHSiukhw51NXTZ0SOrG8jqVvt35hoPMpbxctn4g7uuhtYAjy6EGUk52XYzyWYVSjSUAI6ieZlczqmCpL2goZid87mR1CvzSTnklQUw7sK7gP+0aOansPmjCzczpMpAdNKq0qGmzO0jn7J8Zuy6aysa3+jDmGIZSI/MDoOs+/Aof13UViyB/dgW4kvWWqnTgRTAXpiLMMi+lZuRaHyVfArjsP53nSnBycGSH8O5eoeGPYJ1oQwcTvwjLXjA50AsrkIvNZqQg/u7yEQm2uPBH4lq2u5zv8LN8agzit3O+XB+v/K23Dwu+x36rub0/qEWNMvMssOwjpbxiMG7DAeZqw/ZHfLj/QAoSEiVh1N5z27QxB7GWVcLpRswNWIDDOaO2qwqRkcV8yK+oXvB5lmnrQaS85S0H87GlBTB+EO0Hn04nSu4E8KU6KSTeD6PxySP/2IDjSfGnccLfs2cYdJcB834nkAfhUhABdoa9TkUOXMUqkho7OED9Z2CbGDi5qhfDu+NVri15NnELC8D/MJbQC2BAT9/BAUv2Pfulo5zb9i8xJ1o1Zh8MBXWHiJHQgimT8+oHk3oVkcUffIAxhvbLQQkCy7Y3K/psZ3U7Wv6QaoHXgeXNVkmuY9Rr8/fp7nxSyhV7c5lv44eTu5Eod38/wHR8u+//ZXdzWjZXNNFGfr5OjWm+nCkFaZZ2Qm4q/9NQuSd0GYKXEscBh9+9xfwRwn2zJn1A+186FA3vAAevG+9dOlTCPyAPN+ReXKHjk1Y9yTU4eN9ch3y2ef9U4FnPFolSuyMDCX23HbTy3bk5Wbcnye5QzzSo8s= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6142084f-fb12-412e-4acd-08da74ac7c8e X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2022 17:29:00.2524 (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: DB8PR01MB6453 Subject: [FFmpeg-devel] [PATCH] avutil/opt: Combine multiple av_log statements 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: anfl/vy0o1xZ Signed-off-by: Andreas Rheinhardt --- libavutil/opt.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 8ffb10449b..da3a65c041 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1329,17 +1329,18 @@ FF_ENABLE_DEPRECATION_WARNINGS av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); break; } - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_FILTERING_PARAM)? 'F' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_VIDEO_PARAM ) ? 'V' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM ) ? 'A' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_EXPORT) ? 'X' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_READONLY) ? 'R' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_BSF_PARAM) ? 'B' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_RUNTIME_PARAM) ? 'T' : '.'); - av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_DEPRECATED) ? 'P' : '.'); + av_log(av_log_obj, AV_LOG_INFO, "%c%c%c%c%c%c%c%c%c%c%c", + (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.', + (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.', + (opt->flags & AV_OPT_FLAG_FILTERING_PARAM)? 'F' : '.', + (opt->flags & AV_OPT_FLAG_VIDEO_PARAM ) ? 'V' : '.', + (opt->flags & AV_OPT_FLAG_AUDIO_PARAM ) ? 'A' : '.', + (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.', + (opt->flags & AV_OPT_FLAG_EXPORT) ? 'X' : '.', + (opt->flags & AV_OPT_FLAG_READONLY) ? 'R' : '.', + (opt->flags & AV_OPT_FLAG_BSF_PARAM) ? 'B' : '.', + (opt->flags & AV_OPT_FLAG_RUNTIME_PARAM) ? 'T' : '.', + (opt->flags & AV_OPT_FLAG_DEPRECATED) ? 'P' : '.'); if (opt->help) av_log(av_log_obj, AV_LOG_INFO, " %s", opt->help);