From patchwork Mon Apr 8 12:57:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47929 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp2457583pzd; Mon, 8 Apr 2024 06:03:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVyYC4FeWhhY6hv3l8840ZLeTlzC8gEU2DY1h/8weUo8j5/6vcQl6Ulk8vwAf586YiAhVHhHZAq8IgMvxEhv/eRS6td4GtmngJqFQ== X-Google-Smtp-Source: AGHT+IFEVnc5LMpYj5bZvXePl8YkKdJY2GZI8Nk573QJzf1gfDHujWc+Ytw0ZqdZ35O32EfAd6Ed X-Received: by 2002:a50:d619:0:b0:56e:3601:c761 with SMTP id x25-20020a50d619000000b0056e3601c761mr5254310edi.23.1712581388182; Mon, 08 Apr 2024 06:03:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712581388; cv=none; d=google.com; s=arc-20160816; b=kQIA6y4nDshm7xeW36xU9nq6IwjKd8D2IsGNhs6wSg8uKKDzphDfAAiOwWNug4+R1h NgkuiRjuhkyQsS+XTnFpnlgP4UJxiwSWj/UhG+qxBAQJMlKedr2hJAU5OVPLrapBdx8H BCaBIVZ0VtF3Y4w82Vykb0YsRtkMN78sEplJPrTFFKzQVSP3PVUzFePlcsMY/GpWcg9O Pd9kGANRvJwfis8pwT2Wn6svtNpVI+Cv19g/5NVsjrYMeHsgG0wDCyMBh0C4UwdTaC94 mAhe8UbC4XSWlxgDzFNcEU7KjtNWtjFXVp23UYS8Xmg4k0Vvn9weKta03NRkQptM87ib nv5Q== 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=Na7ehmHM0ul6T49IVgyCWs1xbNf2vc1qm5c17WcwMpKvhPTFZ8MrABnTKy/Pe7KKv+ J0W73ejL0mHSIXZNFIy3+lRqhZ/m4hoXHBtoRwfWykd4DewX2S8xd/vwSApJDMdpZHlG FbaB1+DswztVeSKD6PctKBlHrYuXZVEgkCxww0FN5J6mG7DOcjRWDYoUG/UTMjOJjlvh 2ys/hT8jGbuasrS1HNy+Z4hOLNqcwnc28BuaF+KAF35mV6OWJZj8JwsAft/plw0fwdw2 cgILl1PAYpmRrMu+fJc9F+85duzgI1dossFDlLGUSGpVrIR6Bk0/atyn91DPR7BGjHIi wldg==; 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=T4Wyaaub; 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 b30-20020a509f21000000b0056c2ad5d0edsi3589803edf.96.2024.04.08.06.03.07; Mon, 08 Apr 2024 06:03:08 -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=T4Wyaaub; 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 8D85768D352; Mon, 8 Apr 2024 16:00:17 +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 880F468D25B for ; Mon, 8 Apr 2024 15:59:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712581194; bh=3/VAVPZZSeAp2OfHaHXLchGI9H0VELGXWZz8M97gZM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T4WyaaubsczKGbrCqb1llpB7XdLWYXeGTaiQWM6BTKVksqhIfO3KKFevX6d7xyh5w 80m4OFkqY9Pdgv8WTBfil8cm8Juls/dsOEO3hi+vLONs0e2wjm174iztcL0h7seJnL 0opZVUzkdCBKkZuCMIsP6yfRIQzKUmhoR3DhiETk= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id CA77E47293; Mon, 8 Apr 2024 14:59:54 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Apr 2024 14:57:15 +0200 Message-ID: <20240408125950.53472-12-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125950.53472-1-ffmpeg@haasn.xyz> References: <20240408125950.53472-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 11/17] 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: 9nEuXLJUuoxu 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)