From patchwork Fri Aug 30 10:15:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 51237 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:4027:b0:48e:c0f8:d0de with SMTP id ky39csp304735vqb; Fri, 30 Aug 2024 03:35:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWmn8f8yQI61JXEL87Bjuw7ed5TuOmi337gzQdO6TDa2H9olZW4ePyGnlKx0K14uNllgUukPQbovIKsfe5Mlw+l@gmail.com X-Google-Smtp-Source: AGHT+IGTpUJjs+UTwQxi/5V5sErmOMJN9YBpYAzojMorjum+pkWlX1jDyzX/J2G0HsrhvjTLG4zq X-Received: by 2002:a17:907:971c:b0:a86:9e3f:fdc8 with SMTP id a640c23a62f3a-a89a35be870mr75107066b.4.1725014112454; Fri, 30 Aug 2024 03:35:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725014112; cv=none; d=google.com; s=arc-20240605; b=hHhzGc8H1ZwTYXgEEla15vhmpdf1wjIUEBUKoyUInqKzs/xpvIHWGux5Q5tgAfGKLZ sDumN6MxCdh8OJPengSepVf5Feaij0+wwWSWOt+/zIa4orNuMFXemsnbuyssQ/cEtC2N UK+ooXydoC6RmiClC/NyUtCgODzeie+b9f1KDALVko8KHpyNqSp3rUAZGOrQKZIJsrgf +WzorwiqyhrJkbZsWVXfGq0Xyos+BFdo4UG9/D0NVdw/wuxNzCmK0fXYL/y1JJHw+7Qa Q+wALfcR/Z5MPfmwXb35e0mqoYIENX8g1nmWMaMp0K1ScRbjj7VS98368PHP659JwTLM KCFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=GSjxT1x+GLUCxE224DfJkyyIKRVrw9KIF5mZLyqO3X4=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=kmYCYjkR3No095ctnT5pW7WWVhzpBct/1O50HBxCmSUkxiIrsMIb+ZaGYPbJIbo7y6 amyOet1L9MOe1JVt/AzPXbXm0PSrka8USXe3C5LpM0Zcpo1FGrgS/B9pK8nTWqlp05Qb kAdEfogUBmHA6K2FlcVavO8xQs+PNW3XHK921oByI37dXeSCw5/TD8P1Yt8AGhlY0Ja3 B8Ig0m9iwo2tn4tjrxH0LnNntxsJrJcXjz+Vqftnz8EIk91dQXVA8BQpUj+1mWWdhGP0 hLbysZbr1RIDmOC1ZihL4pyFdrtUUlfuD8FWIhhoq0xtLLw+nCRoHU3GURkM2xEpu9h0 7JuQ==; 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=OHXQrr+M; 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 a640c23a62f3a-a89891d097csi278078666b.864.2024.08.30.03.35.12; Fri, 30 Aug 2024 03:35:12 -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=OHXQrr+M; 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 9F9C668DB72; Fri, 30 Aug 2024 13:24:21 +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 257D968DB6E for ; Fri, 30 Aug 2024 13:24:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1725013450; bh=W+oEIfIwaCXFCkOqbW+9qjNOvXlSVMRKzKCwaCFby3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OHXQrr+Mu9QVXse6kKY5fjnq8ldcFmLqXRylITyyfu3rg9q51UQWUUvKJ7gGuzlI/ P7OoGBI2qG92yfAZqSGcgKsdrlr2fpYXpRcs4X4Ys7HV+B3SXzfgUJzLxoLKc4yCiT WbihqEvnwafACI5Bu7tvyiuMIIofTr20MD7/R9zc= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 7344B46D34; Fri, 30 Aug 2024 12:24:10 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Aug 2024 12:15:34 +0200 Message-ID: <20240830102402.18149-12-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240830102402.18149-1-ffmpeg@haasn.xyz> References: <20240830102402.18149-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: 9aeePzjX9pnK 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 9609c6c739..9441d5726b 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -530,19 +530,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 b562e8417c..d54beb26b7 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -416,7 +416,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)