From patchwork Tue Oct 4 14:40:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38552 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp157938pzd; Tue, 4 Oct 2022 07:40:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5pE3msnLpp1lyP4aDpbaRM5GDcXjVILpkTTzc3gkbSHbF7ZrLcnH4sBHZkWnyS8eoQL0Y9 X-Received: by 2002:a17:907:d15:b0:781:e347:723 with SMTP id gn21-20020a1709070d1500b00781e3470723mr19262121ejc.723.1664894423780; Tue, 04 Oct 2022 07:40:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664894423; cv=none; d=google.com; s=arc-20160816; b=kEhqFRkpqMn7szP3Vx0BtcmOvBwrcgrNQt9zisjr9yPmiB/W/a4WR2tdeYrtKGwCwZ aBMPWMgFASmu4tdqmExmprYXSoU1WNtS8qB+ZQee/irrjcsj+LEXNRN5MaWJl2xQfRSW alnBhj2W4ShdMnUxNDiJLcFQoNT35jX+3GHrub+tGlPglrgTbIkoe4+gC0+lQdCkxQhu ENZWAkFHUSSU26+Oed85Flise4CdsIyQ8GBCOxkPUVJKXn5cKe7vPJI4XWouQVeL1jFW OBU5XqLScnTktEZaUOqia4V6VyEQFcXPpUm455SaW/SplzEOm4B3cZ1EfcVM2B4U7rk0 j9kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=5YdsdKqMsvcXqdPyP24gB468UK1nGC/PHQHn0/q9Gwc=; b=G/q/E1rn2JSWgr95E2iHuAeCUZDihD7Y5zXJI4xf1aI7KtZibOxw+MDxilwTWWlfi7 dcIbqxFCezu/xmNuIwk+FV8CPoYSmo8mG+MKJzMpGwR1Q0kz/0P+8AFxRMVN9Y3awj1W d4sG1xnYhugWhSw6H5kEhEwFV3EAvv/rYnNbYhrzakmxHPG7Z0P8PejFdkMPAIIqOgXi yvMKQ4zh3SiTzjEA59jVhB6pgxQVGXjXU4P9w6hv7toH5RicRzBq/XgTH2qgZTamFakb S5Bb+TT7UB70LtcAX1AwHIWktPwQH1VE7Fs1dbmsO+XY/JiPCT3uq0VvqGXstvD96X8X G+cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PRwqIzt4; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jr3-20020a170906a98300b007825337afeesi10191232ejb.273.2022.10.04.07.40.22; Tue, 04 Oct 2022 07:40:23 -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=@gmail.com header.s=20210112 header.b=PRwqIzt4; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C5FF68BC41; Tue, 4 Oct 2022 17:40:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91BA668BA39 for ; Tue, 4 Oct 2022 17:40:14 +0300 (EEST) Received: by mail-ed1-f54.google.com with SMTP id x59so9144578ede.7 for ; Tue, 04 Oct 2022 07:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=yFWglonU7QTLQ7wGSf5VXsHonAIHXM4pltF5ImwY+Vo=; b=PRwqIzt4t5H46ERY7uJ3FhH5ekdQywA/4JQDW1elLqiC7ebzM3D9Y+OMsG9rgsh5rs g5XCPG7p5Kd2X7iVs5ig03vTAoR5m9Q3DpDXHb9+VkZOk28RpP5pqHg6YUXgVOzA57tK QnOZoAEhQ26Fk+4NDJmopAAwb/Zym7gofWPSeqzb0Wk2z5CJaH1x/VmKm0/+SUe7iavI OaKZgNR9zJwKeOwJkWDjOE826lAq93ZP11hTjgdoVrhAMRijda9mGHlwzUwWcPzRM7YZ G12Sey1jA4l98braNrPfr9hnDMkIS8zUeq+JyDjJzCPno8oVDm2yieWKRHrHrqLh/9xn pQTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=yFWglonU7QTLQ7wGSf5VXsHonAIHXM4pltF5ImwY+Vo=; b=ftmzZSo3P2fnFJ/CeleoB+8L87GIfvIYz+qmLPsntlVsUbw4QmKF/q9xIlf01J+EVI VrWJFqBCivJLAwQcpIBUKG83GRcvFZykZrEP4MRWm/oAbAwM78IS3zANNwZQmZ3VvDy5 AbM9Zjs5klGNfCPxD886oLdEuKKWOQMKxe3maggAW/sqfuaIm5g5JJL5T5e+v6pyM8V1 KMm8Ar+65YGvXirFIXtJMmvKz0qyk+7BLaIn7k8hy7cVznIKPVkyRFW/0rVJBoD91TDe f2G8RciS8RJv9gJPms18k/TyS4PD9OaevGCYCTbdw11vAWamLlAS8zWFfx6rtvjad3a/ 1sJg== X-Gm-Message-State: ACrzQf00crkghs8FoWjaPkagylVfRSvVXZD4+859GPWTSCqBOXxZNO0j Q0lOB/C1sbKrVB64Y6JD+VGT9TmMm9g1Ow== X-Received: by 2002:a50:bb68:0:b0:458:abbd:faf9 with SMTP id y95-20020a50bb68000000b00458abbdfaf9mr15101457ede.177.1664894413426; Tue, 04 Oct 2022 07:40:13 -0700 (PDT) Received: from localhost.localdomain (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id y21-20020a1709064b1500b00722e50dab2csm7190554eju.109.2022.10.04.07.40.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 07:40:12 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Oct 2022 16:40:06 +0200 Message-Id: <20221004144008.89188-1-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] fftools/cmdutils: Use av_err2str 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oWceYEqwcOJ0 av_err2str which is a wrapper for av_strerror already calls strerror_r if available and if not has a fallback for the other error codes that would be handled by that, so manually calling strerror again if it fails is not necessary. --- fftools/cmdutils.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index f911c52be2..beef8ce385 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -798,12 +798,7 @@ do { \ void print_error(const char *filename, int err) { - char errbuf[128]; - const char *errbuf_ptr = errbuf; - - if (av_strerror(err, errbuf, sizeof(errbuf)) < 0) - errbuf_ptr = strerror(AVUNERROR(err)); - av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, errbuf_ptr); + av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, av_err2str(err)); } int read_yesno(void) From patchwork Tue Oct 4 14:40:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38553 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp158101pzd; Tue, 4 Oct 2022 07:40:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7xLnVuBf/jm6GTsGwOF5DDXVvI1TfwAxIgNI6EzgaPMMk+Nb8ZOWShikj+1vC5nLPRNroY X-Received: by 2002:a17:907:70a:b0:750:bf91:caa3 with SMTP id xb10-20020a170907070a00b00750bf91caa3mr19477794ejb.711.1664894446157; Tue, 04 Oct 2022 07:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664894446; cv=none; d=google.com; s=arc-20160816; b=WO1bxcRAMb0E8sJZpGXTqMWudQdBTcXD2lRK/OCliBdDxk+cBaQ2PYQ26+bO3BfJ0d 8ZE9ZqYuI5O6HxzAgjotzoMUYOD3u3s0JEiE5y8HUXTn+T3yR9V5JnnCXX08gF5cyKdl KMYiUbnnCwO+XK66LXPlXqo4tknhwX0pyHxcTUbokATjESlBJMqqQC7wQWehE+YK6Mf1 BTVa+ZA8QIhsVXdsLi4YWC+LiRy2/sete4MVSooZ1aq7ujDmGBzGBGH0YVf6HZtOrB45 Bm5YAxKSzSPTtTWlsn9cuDbxv6v4llBg5PNz8TAqLHoLAFcolz2Qyex4XyFp4HhQGFgg RkRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=4x7vxdGJhjlKPB8QAHlonnYQeQeQegB1LZqkkyhsiqs=; b=HM202E5h11fnsyqpZ7fFq/Pa8Eb6+sLfMA6tk8h2qlu6/HGPHvWbk7j2cx2OSVIX2y vhSxuPWiq1b32h6DE/1rEBG96eMvRvbYIRf1SRxLZTs+1XlIuvWauflci81tDX6KCedl nB6IA51go3zxnSJA8JxTvWxbGAUnkBdqFEil6RLgVtsO/Thd0ILfPUylC75XZwxsuKmx xHmf0H7s/pmYBoHcqnYuKie5DHzE87RBFCZ6yks9Nb4DLneQ4yqsiZqbjWZUOQu5PTTD CZtjoGQy61oiG/EzmqWVAj8aG754Sloj9GWNjB/Lg2Y98js+7hPhtsQB8buQdMq8U5il CMPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Saudrk8l; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m22-20020a056402051600b00447e34491basi8009560edv.429.2022.10.04.07.40.45; Tue, 04 Oct 2022 07:40:46 -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=@gmail.com header.s=20210112 header.b=Saudrk8l; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B8FA68BAA7; Tue, 4 Oct 2022 17:40:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16F1C68B353 for ; Tue, 4 Oct 2022 17:40:37 +0300 (EEST) Received: by mail-ej1-f44.google.com with SMTP id kg6so14000689ejc.9 for ; Tue, 04 Oct 2022 07:40:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=drL5AdDNE7k9t+z2VM1wJOIRj6ox2+oh8O2y1lXjBXE=; b=Saudrk8l+mHGaoyE5nrJ26BPqTwMMgswCmlmWRXoHUWuc+hV5BdAQmigQSQSuk/vin 7YfiZI4igdZzF8hNsZxdMUcbNJwmADdwTQz+Cyu3QJWmHaeq5uql5gpXvdMoNg/NY/H3 25XVGIjh/3g1kQJkdkySr2miVQjiVlE6gFwA4pxWXG/UYO9dR9vB06dbqYmvI5aKMkWJ m20wOgSr480yaiMyr4Hnpps3U/YuNQhivG1jiUwuwMLFc91gozcGMqPxcOWaWsI7RTr8 hY8IGDqH1pBPfevOmisTDIiNv9JGcQ9U9fudp2CTQ/Egw+SSlTo5P0lECn9TjuYrd/Tz fw7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=drL5AdDNE7k9t+z2VM1wJOIRj6ox2+oh8O2y1lXjBXE=; b=toueIZeZ+Yztnw5Aqaid7gRspzuTpm56S5FcQodTMuMxKW0BaSwMVPY3aee+Pus3m3 IMrgdIaEUfHNk7KXgoPkaQmIt5pWtkNo+GMKZU2j0V7+/52V50YCCWTLWcYrCLKKjyY7 mqv3poqQ8Ou2DX5eYEBny9ROhxt3nhZldByWiFz8KnP+XEsPHo3LPfPFVt/jQ6M1bjSx yZxzidL1D38mkWS7PhRHKLFX4eCEAZtTZ2HtthSWALmZ73UVawHEVU3I/fnvrUQYBoh2 JdnL1lYycrj9iIHGBRFLHTveFc/L9+Jyw3gebI9EsvLttbwpX+wZlvaYvbjmv2gg4ess c6/A== X-Gm-Message-State: ACrzQf2ns42o/35xj3AKkWfM1hOgdmcNFfx2nc6saQzuV+q+Ai7vXnzT zjJoS63yZz7yf/nYkk9y/XT9YeskHygnyw== X-Received: by 2002:a17:907:1c08:b0:782:a340:56d7 with SMTP id nc8-20020a1709071c0800b00782a34056d7mr19065939ejc.98.1664894436342; Tue, 04 Oct 2022 07:40:36 -0700 (PDT) Received: from localhost.localdomain (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id y21-20020a1709064b1500b00722e50dab2csm7190554eju.109.2022.10.04.07.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 07:40:36 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Oct 2022 16:40:07 +0200 Message-Id: <20221004144008.89188-2-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221004144008.89188-1-epirat07@gmail.com> References: <20221004144008.89188-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] fftools/ffprobe: Use av_err2str 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M2TZBBWg1aaf av_err2str which is a wrapper for av_strerror already calls strerror_r if available and if not has a fallback for the other error codes that would be handled by that, so manually calling strerror again if it fails is not necessary. --- fftools/ffprobe.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 421ada5bd8..9b7e82fd8c 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3279,15 +3279,9 @@ static int show_format(WriterContext *w, InputFile *ifile) static void show_error(WriterContext *w, int err) { - char errbuf[128]; - const char *errbuf_ptr = errbuf; - - if (av_strerror(err, errbuf, sizeof(errbuf)) < 0) - errbuf_ptr = strerror(AVUNERROR(err)); - writer_print_section_header(w, SECTION_ID_ERROR); print_int("code", err); - print_str("string", errbuf_ptr); + print_str("string", av_err2str(err)); writer_print_section_footer(w); } From patchwork Tue Oct 4 14:40:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38554 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp158175pzd; Tue, 4 Oct 2022 07:40:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7GFTQisJ24VPUy/IXy1FKJPOGEPDmJ7ISPDGvtu/sgOTT6IHRhCBZuVJanqH9n+UdfJpnK X-Received: by 2002:aa7:c956:0:b0:43b:206d:c283 with SMTP id h22-20020aa7c956000000b0043b206dc283mr23732237edt.381.1664894454578; Tue, 04 Oct 2022 07:40:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664894454; cv=none; d=google.com; s=arc-20160816; b=ed1JoHx4npRQDHe3y5mphgmU2ZwgykQYt+j6f91ZBjUln6O2rMiKDzPSXwAE8/JgTZ X74IDmtutf3nANxNCgfUx9C2MGAE2pciW5ss8x2imilGcXxH/Aos3RdtW2d9AGbvOrAj 5HuM0zpf9LD1qce2B+Y22yN06QfkgALLW/QWfrtu7Oe3FkgJ6bbby7Sml6P3VCfG3uOK ylKB2jYUOuLmjG8EfLjS+92oziRlhb9Fl/7pgWplStuO6/QqAOKBZ1tbVNK98Ma6U3YZ 0anMoYso3OT7MUv9eO3+7gVlvLEak17FrgvM/Pl0+AS4Lu4qfZZ3sxPpdDw/8Jg81WeL xX4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=xE4wcCTMyW+rWpCcSZLBdSXCspVY0aY4kfz9KbP9VxU=; b=LmRuTVTllY3KS8g0IECA82gCGEzprYIE+sp3c5ZrqzgyaWqrZgjHUvznXFDSw/2M4t 64caexVvsQIRv6vTRKl74Md9U79brCykLKREnUQ7E2qFKoLDVxSjMBLOQyTH58j1mM8k xy3Ga7BPNCkCfoXPpK0ijKVfeIyQFrHVNUVta0p1dDI5Uyveu/5/bBpm3x1rWophIBCz IS70iXDhdxFsBbPpPdENhzbF+sBtU95tm9HdiJHTL9rQJgadMuVEiB8L3yPcewuAuk7w MC5HrmMg3jk2euzNeATeau80B4NMpb7gHb1b5+kJfjAfwDhb08bRJdID5ioCiX3dee67 ru+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="p7oDzAd/"; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x4-20020aa7dac4000000b004565c425112si8750647eds.412.2022.10.04.07.40.53; Tue, 04 Oct 2022 07:40:54 -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=@gmail.com header.s=20210112 header.b="p7oDzAd/"; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9613468BA05; Tue, 4 Oct 2022 17:40:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DC1868BBEF for ; Tue, 4 Oct 2022 17:40:39 +0300 (EEST) Received: by mail-ed1-f47.google.com with SMTP id m3so19111122eda.12 for ; Tue, 04 Oct 2022 07:40:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=cKAAtGKv0iyU6ZBQFvY0hNjX5UHIut7OSeVMind5Mo4=; b=p7oDzAd/juTFpMLH1A03HylgG59Mj/yOlCnzq+UuOa1bTeZIpHdKcBGjGkM+DSP8Qp ZKDtgpn+dFTvKNhG3Ow5v2+o98+FM8Qem83qzKASltch2cD+WQ+MXlKi5UQj43R5JYKJ wWESgrgt6liDUfdqvUc4zBj21ynU4Eyju79p5kM3RNhZCuqXos2ZPKYKOmQSZhEDRmAw DFdF6aUgCuMmZl+Q5r+iMEHSNhi9PANFHpxA7vfQbN8z2qeyl2ogzfU5pyUs3fBCDkVu 8qeClnYmOMB+/nggzwxObmn4nn1fZEJoMLzOWRJBVgXC8FURk/5GOU+TFm9RMc3yYnlh xAOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=cKAAtGKv0iyU6ZBQFvY0hNjX5UHIut7OSeVMind5Mo4=; b=scDnbGRO9fcs23Cpn4ICKBbuScQUemyILE7i+fOR8Zs0Xd4au5uUPlRu004MJpMp1w U8aJUiK/v2xAgyknsJA6ZpkEpucZVZb73y5gGoZmWvDD/0z0+Q0WCPFlKUzdKhjQD8IM Q8bc53R3zNfv0B1n3INIy/bX150QJ4zKPyh2M0xm3pkKwlVggbHGsOKtGT1YbST2JAwX iRC92EnKV3+KBhSmIeeclnVuDJ4t+rz95CG4ablc3a2OT/6792naZZbUGcjYT+QFXH8o wwelnR7w+hrABzn4hZtooCv4NrYKQN1GFInseE30ZY69CEtBPADG0xJpOXO56Z6UV1iD RryA== X-Gm-Message-State: ACrzQf2r+facRRmXjHaSEEBfXtyvdiR9q31G7mOp4zT9KhMMu0fqwWeu ZXZTG1iyTHIMqIUBEjWeyQIslXx3G+ZAug== X-Received: by 2002:a05:6402:5409:b0:44f:1e05:1e8 with SMTP id ev9-20020a056402540900b0044f1e0501e8mr24043923edb.373.1664894438244; Tue, 04 Oct 2022 07:40:38 -0700 (PDT) Received: from localhost.localdomain (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id y21-20020a1709064b1500b00722e50dab2csm7190554eju.109.2022.10.04.07.40.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 07:40:37 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Oct 2022 16:40:08 +0200 Message-Id: <20221004144008.89188-3-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221004144008.89188-1-epirat07@gmail.com> References: <20221004144008.89188-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg_opt: Use av_err2str 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aDOYf3aMokyK This simplifies the code as there is no other place the error buffer is needed, so the av_err2str helper macro can be used. --- fftools/ffmpeg_opt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 8f57b699f1..272a772283 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -3716,7 +3716,6 @@ static int open_files(OptionGroupList *l, const char *inout, int ffmpeg_parse_options(int argc, char **argv) { OptionParseContext octx; - uint8_t error[128]; int ret; memset(&octx, 0, sizeof(octx)); @@ -3767,8 +3766,7 @@ int ffmpeg_parse_options(int argc, char **argv) fail: uninit_parse_context(&octx); if (ret < 0) { - av_strerror(ret, error, sizeof(error)); - av_log(NULL, AV_LOG_FATAL, "%s\n", error); + av_log(NULL, AV_LOG_FATAL, "%s\n", av_err2str(ret)); } return ret; }