From patchwork Fri Apr 5 18:57:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47867 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1158004pzd; Fri, 5 Apr 2024 11:58:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXWNBcg7zhTS422xMWTNqJdjiBaSLn0jG2W39C0H4CX93HDbIM/lIqzcmu6Ji/mlwAN8R+Q+5tcUjoVGfzQBC8Fnh1MPqmRaIn7Ig== X-Google-Smtp-Source: AGHT+IH88pNDu2yeyNlHrRiglThMvVVIEsdfoXnf5TWahfLJIXJR3eeFdvl3lMeZByI4yFDmLQ7v X-Received: by 2002:a17:907:2cec:b0:a51:a259:a5e8 with SMTP id hz12-20020a1709072cec00b00a51a259a5e8mr1559043ejc.3.1712343519410; Fri, 05 Apr 2024 11:58:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712343519; cv=none; d=google.com; s=arc-20160816; b=ROW3xvmJS6Uv6DLYr6HudL09QKDQvJH3fMw0mVneadFvhgVRa3EPSWTJK3fdmjLmo+ NRBWTmj5kyB3rWWtlF3WF3lsv6Dava7Xc0eyEPo5p7qv2v4NnKAJhYzDE4o2wSxDTjdI z//7wjdc2dRP18aVBo0RY2atcsK63qTXQCGNn5Ul3U5PZb/ZqGVkLJhmrAjWUBFr5o12 Ot3zRFa0f+ZrKXMQJP2lKlvEf+XoU9fSzg4mkfHQHTTxgWNG4maX6f6gN3fHvB9NHQaV n/RPYwvpleFOJsX5Bq8+oVHVlHBK0ZLZSORQEBxDz1oTYfTpOKBNHvKi+OPLpmE/NCBP CbrQ== 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=1xT1JLEjXv/pthbDq1Z0KcuNczhRiPL+RdGG0w3l7dQ=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=H9Xl86b5KymEaQqpEsc3JxZYJc0NeZNkXg32VrqdYolTiQir2tX+Qoqg17lDXRJBRQ JRP0bvDcbmYypFt34vqOHh0UhNlOHcK1zHmIHLEkj9Fa1cTDhUn8LwnDUYyokNd3V5B6 EXbk3PqfNHjP18RcYGFLYFWGzjeH0s+Dgdrrb2WuTV1BroZCOe3AboxrjuuKqQJpTK1O zEoTukpdCt9GSbn2MbHLRnjtMJObIBJTSiqTsx/v2UeH8WUgyPdcvPsSocUPELiA2Smv 1ZDQZ4dw89JQ+cZlVFv6TVvtSK3V2kiuSRtoYDaImsCBaM+sqoZabknGe319XFN1BuGx PVOw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b="Ln/D2HMq"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h19-20020a1709063b5300b00a4e25f6b5d7si933151ejf.655.2024.04.05.11.58.38; Fri, 05 Apr 2024 11:58:39 -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=@haasn.xyz header.s=mail header.b="Ln/D2HMq"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADB5868D200; Fri, 5 Apr 2024 21:57:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 90F1468D1B0 for ; Fri, 5 Apr 2024 21:57:31 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712343447; bh=3/VAVPZZSeAp2OfHaHXLchGI9H0VELGXWZz8M97gZM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ln/D2HMqg3pYvSzcvt9NVWMwv7p3A1nj09ajPVsDueoGhscLWsb/AiEoOsJVDRrAl hezsIe9dcSwP3RJ2SK79A9zqIKElZqBdWQQUKnHB/6WksiBPyfJx6kUbg0mPHKVMzK NG4z4AWPqSATYpeajxA/z3/yvkyjBNb3CWjuz6CE= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 9E38143961; Fri, 5 Apr 2024 20:57:27 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 20:57:19 +0200 Message-ID: <20240405185721.111072-9-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405185721.111072-1-ffmpeg@haasn.xyz> References: <20240405185721.111072-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/11] fftools: drop unused/hacky macros 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ef2ehfVvnau7 From: Niklas Haas Having macros initialize local variables seems strange to me, and there are no more current users of these macros. (The one that was commented out was incorrect anyway, since the macro has changed in the meantime) --- fftools/cmdutils.h | 13 ------------- fftools/ffmpeg_filter.c | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index d0c773663ba..940541b9eaf 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -465,19 +465,6 @@ void *allocate_array_elem(void *array, size_t elem_size, int *nb_elems); #define GROW_ARRAY(array, nb_elems)\ grow_array((void**)&array, sizeof(*array), &nb_elems, nb_elems + 1) -#define GET_PIX_FMT_NAME(pix_fmt)\ - const char *name = av_get_pix_fmt_name(pix_fmt); - -#define GET_CODEC_NAME(id)\ - const char *name = avcodec_descriptor_get(id)->name; - -#define GET_SAMPLE_FMT_NAME(sample_fmt)\ - const char *name = av_get_sample_fmt_name(sample_fmt) - -#define GET_SAMPLE_RATE_NAME(rate)\ - char name[16];\ - snprintf(name, sizeof(name), "%d", rate); - double get_rotation(const int32_t *displaymatrix); /* read file contents into a string */ diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 2308abf82af..ac04841a16c 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -401,7 +401,7 @@ static void choose_ ## name (OutputFilterPriv *ofp, AVBPrint *bprint) \ } //DEF_CHOOSE_FORMAT(pix_fmts, enum AVPixelFormat, format, formats, AV_PIX_FMT_NONE, -// GET_PIX_FMT_NAME) +// av_get_pix_fmt_name) DEF_CHOOSE_FORMAT(sample_fmts, enum AVSampleFormat, format, formats, AV_SAMPLE_FMT_NONE, "%s", av_get_sample_fmt_name)