From patchwork Sun Mar 3 22:46:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46743 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2499576pzb; Sun, 3 Mar 2024 14:44:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWGtzpNDltPJCD9OPE4qr5Co6OUHyJaamJCmsm+HwQkd33wbYCwTmeV9YkOHwg9riWQ5ulX11AbtEMw3PW5Xtap3a3ZiMAW4d4gCg== X-Google-Smtp-Source: AGHT+IEjKQIMQ5lDyQCVBVANENRfP+BiZ7xBq5zRcHHfJOycoQwaz4cUi9gn+K+GJ9y22jFkEzHs X-Received: by 2002:a17:907:11c1:b0:a44:790d:6a with SMTP id va1-20020a17090711c100b00a44790d006amr5037768ejb.4.1709505882474; Sun, 03 Mar 2024 14:44:42 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i18-20020a17090671d200b00a44c6dd972fsi1766974ejk.841.2024.03.03.14.44.42; Sun, 03 Mar 2024 14:44:42 -0800 (PST) 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=cMHrh4wT; 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 5A8CE68D3C7; Mon, 4 Mar 2024 00:44:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2032.outbound.protection.outlook.com [40.92.89.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D800D68D1E1 for ; Mon, 4 Mar 2024 00:44:32 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I35ttWDJ1a/JnrxOtW0XC+a+87+0Ml5FyQYPS3Py/u4SIX1EnFPnQh8HpNJ2LZgk2gBbqFBxIpWmNhtfBUxda+UYFJpIQATCRan4+cYNerzt79fQORaJ2MPEbS4VKwgcBPJS1SasWDFQ0fhwB+HdA+8GZpm96zAfgG9e0ZicmoYf9PPMt96kxeaYsfTLSG5uddH7ZfDQuEEgFp8r5vruKEPjPZXSF3HYCeQvuFA7DDMUfVyDZ1GswFRna/Igg21PB3M0fnz4A18EsF3HYNaM+VPZiPktbDpFiu+kFVvH8dRZKu6nYOHbURoG8vh6lqyUyxRYPU1yHLOynYIIIm/law== 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=6MY88IWgHNFkhOPOAhzu+N2/PsUmz7PlR95h2m41+Kk=; b=fvBEpPBNVSlZLJTejyLYqz2SYPvqUfeF69uAukNaPQriPXkNDstH2p2j5ppPgk+FClF2nxsm8oWUz2k/ZruhZ2qD70IRPSAOje77wGml8EJ7Ib80MIbqnr0IVSTNlpdK94MxCpqnfGW6bVEb63jhFFrhqkV0+WfGs5zXA1gfQVgEWEMgVSm5kTn7w+S6hdCrXAl1Y8Ju8WiY0V9m5dNe437X4Dxny9xkBWgtlQCVKZ0fO9U1UOlifiBYI7DhWNCWh7piIcYbHN0j9u9Y5Qd1+vxpQX1KC5NmXcf26wBRHhhE3JRPjxCQZMMMmktc7GrO+6YDSEcPvbE+E2gytv5rew== 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=6MY88IWgHNFkhOPOAhzu+N2/PsUmz7PlR95h2m41+Kk=; b=cMHrh4wTkAruiV5Ej263VS63jvdDCikF6UDvHB5KSz5ywieioYfWSViWrssGyWsR+pyZQ+baPESu0tAcO1Ke35uQwSyChKb34mXnP/UvdOtN6IIYltPWA8WQI6n+lcb62fL7iSbARsjyr4vZT7WsjGgtJnFWdkQCm7eLnhDBosECLb1pDCd1suWF68jjWAXizAyEkacf+1q9Te0mkt87SnEQe9DX5+smlc7l31/qQVlOkB+4KikO7yRsSBvKwX4+0dzXgMm8AKdGqYz4iPSc8OgPTjjKkbfMCipg/PdkDjZj4CcVRVHKm9ULahAE6nUn2On7LbwrzIIbDm9YS7oAMQ== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by DB9P250MB0572.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:336::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.37; Sun, 3 Mar 2024 22:44:31 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7292.036; Sun, 3 Mar 2024 22:44:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 23:46:24 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [WRMcSMEYwqwwwhjVUQPY6jIHJGK4qL+jLfCr+1R+hFs=] X-ClientProxiedBy: FR0P281CA0109.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::9) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240303224624.897541-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|DB9P250MB0572:EE_ X-MS-Office365-Filtering-Correlation-Id: 558100c2-9c63-4d4b-6ea5-08dc3bd37d65 X-MS-Exchange-SLBlob-MailProps: quCBMN2EvO+k9MGfMCRKcI85C0QQWR3Et7EOA0ofe/ocC7BzaM5UTL3mlJGMorqdMsJ4csipeRVd35ajtxDE7c0Ekq89aI72JeY/6cAAEd1UkNak+7xO32nr957hcTWhYQlZE/U3jkg7kH7/jqGg6IRspWJnt1zozAu4WCi8VZygyK7okXkZnEekW4pYMHItq99eedVvpdZQWez4/JE/lrtIfwsVMf3332qFmlN0h3o/0+royxKX1C1MWJhrnPiESLJK2TAaEA0qBxFl0BsFcECEPhFlcso3RVcQawu8al4RjWIq6jADyk001ky25F++TerxZpMGr0RVtp4R/l3zswu5aYRcAqPmwJJA+Ve+dbA0GG8j72r4IvgDp2+376jkIWOy37UkqaMzAPNSBsiPa9U0frjpDsCOhzrDjS+4+QwU5Vz7B8mNjrFK4UEChV26k181p4RwyWRPynIdh4Usz2Iq4B0GHdSzGLCRU68MwVwtndnmTMhS1TVcEbS3iwDt5pVOVFYp1FE2WGpX9rnlMhtYE7xOC83sqoJTUcMp/vS89yZLDBaQTUMu/qRAHuma8sNGBC0dHWVD9gAdwl5SMWc0yHGDHPZS0yC2czcAHHLv7xF0mboxF9CP57NOCDMTVLXQOOwR65t/0o2PJ06Kyef/2ZcMcyz9BoiSaxNuXKAgjycfIWFbUUW8ovSrshOT9ghILNgOFw4jQSD+R5hRYw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BKv2hF7J2r2db7K/zuyyotqVAHGp/6OfIDrh6Ohsa1I7aR2AfjmEu8q9RQ569XXmSMpXjcejD8Ml9A2hI577eCVDiS0f2V7ASPAtTtlLof6T1chYnHikLGoxr6+rmxEoJnblazkXMRzZKOOStcGg65uin/GockN9O8i1GagQX8rZbsJWOqkQuiy/bMDzMGCvB4R7vXrmhwQJq4uDrdZRBqRQsvnzTvqjJWX6RpIWmMvI8npjrkERyzAnsGgpffgPkAzytG6gk/qX0iQ7VDV6Jhwlv0LON8OmzdGcdqSp0pntH34TwAz5SFH3G5qNF4obeq91EVGW3B816WF9f1m8qvYpj9Z8dkF470tkI1D9B7yCwSR5oGB4yXg5qzxkUq9DWtEjl/KzCf7irjYODxm6t/LNeBy0ckVoJi+y3b0Y9GJ297PTAxrgXepD0vfEJDXMmkx59gMy7zV7zAO+NzMnS8yElkBu2RqY1uo6MizwSyIuC5BLqbuEnO3kgJ8kCSUlL/mDcz/5l7RwON7ivcwabCXWHyWV1ZbagljmOHqF5Vs/nT3VnWhrXBoTMNM1sxCECxne1kDp5cvUlpr+/smm9eDYr7tCZi0UtZFFuxwwrDs/jKcTf3UroXHfhylq7kdQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hykrr4M8uRgGuQvKYmc+90LeW+CeeXDNew9pO6NeHvotlaEe3bufdEEqRVeBrJzaOS31bWbVR78nreMpFz04UwUslH1Y4yFmLmqQAOCgDWoORl+jXlF4+psnIYBp0sy5xPta141IYT++O3t+bI8xGS8rd9+WzXlCa6ELFcH4bWQmJiyXoDq1xLHSuyZURRAtQCB4B36ktIC1vnKulemduuWoQgGdCJ1PbOV5w9+1g1FRFf58WiBvw5BZFIwIvJtMntdQW6EoZqdWZMpQzFrTN85+0CszuZnuBUukNTl6rOdzwgBrxNnQnYlPoltv3pUzgHuffomQZ3wkuWTxjNZV4n9KRAoF31MiLpoClQHoDy+mfq81j22DUZIUx9RqjnUh6q2wFtWTgqPUsLF/Sn3A+y5Pc9+iW3WEEWk7jYleBnsy4+6WCYnWkbtqQ/JfwBMDx4LTcCD81mFLFFoLOkFvZ5Hu1whaqoZ2BUkEmAt7+vGSvRFIUYhwIUNl65vvGQqZOVhtCIlfeXobQVmAQS2jjQOVFM2AVS5XKbjmZU51R9RAMW9Va3fwcTob1Osyp8Sm0kuMvDsAnRsP/BaAqAJt2nyM0mVM9QWVIw0O9Zq8gU3W/HUJsnQkqtpjC4A9D5Wjx0eP6G70fzGU6PJ0gLNshG2GTUIRgKVQDiO0GFvddrD+a20HJ7SU5yKXGpG5b9G8BI6o60CrR4tSOzR+0cjOMQlsTB5fKuugz8pLc6hk90kiNfL7qhiin6OIOr0QJeKZyu6xti5itxirqrGod9Ic4yAYa1eZ5ncPtkedAcnyenXXo60a6uoMnifsoHWzKOPxTLESSOqh8t7odVSHfH+eYwDa/2utspAhoydH1pBH+TvMteX6HkAU6SntTHJ3eo/hfQt3UEKDh04SnbKRX9gR8+/iAqZ5vBIaLPfE7oYcTQSE+GtwGj7gOFby/Pwngu0jS8YclsUwSv9Dx+fvmxuRAhTJCMU54SaatmB1ztpUZtHPORJJhojIozW+n43W7TYU0qsGC2tExOo3R9QmhNQSF30t39/LRuCpyAl2PKGYhcBgTp4WHNBHIYgXeJ2Nl+AasEfV581XsjetjqWHdvuhMRPUOeUxzxvLHW5gWKyuYFYWXl8+qStadDVezDC+GV/VuSBq9dFXfuiV6CgRW6H/lQKoV1SHhrAQPRA9bx8P71rd+ly46IAfsodXBfzd22nIUTyK67tlvGX/FfSlCDoMlHvStRQV1E6OhQqE/nkA0kjED68roc2U9ea23tGNPJml4ztDe6Yw2GcooMtb5vLW9g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 558100c2-9c63-4d4b-6ea5-08dc3bd37d65 X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2024 22:44:31.0837 (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: DB9P250MB0572 Subject: [FFmpeg-devel] [PATCH] fftools/cmdutils: Inline print_error() 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: 3LYI8zTgOIzV It is only used by ffprobe (once) and ffplay (twice); inlining it avoids including it unnecessarily into ffmpeg. Signed-off-by: Andreas Rheinhardt --- fftools/cmdutils.c | 5 ----- fftools/cmdutils.h | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 3d613a4018..008949a39d 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -895,11 +895,6 @@ do { \ return 0; } -void print_error(const char *filename, int err) -{ - av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, av_err2str(err)); -} - int read_yesno(void) { int c = getchar(); diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index 69e253c6ef..86428b3fa4 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -395,7 +395,10 @@ int setup_find_stream_info_opts(AVFormatContext *s, * * @see av_strerror() */ -void print_error(const char *filename, int err); +static inline void print_error(const char *filename, int err) +{ + av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, av_err2str(err)); +} /** * Print the program banner to stderr. The banner contents depend on the