From patchwork Tue Mar 15 09:05:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 34746 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp2837329nkb; Tue, 15 Mar 2022 02:06:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLBEMcZiRZc8ltmB6BwrsXumyOfnmCvITXXA9i12ls1t5TF3AwfZu8wqCMDKQoAqpYHla0 X-Received: by 2002:a17:906:32d8:b0:6ce:d850:f79 with SMTP id k24-20020a17090632d800b006ced8500f79mr21081755ejk.414.1647335196974; Tue, 15 Mar 2022 02:06:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647335196; cv=none; d=google.com; s=arc-20160816; b=vquoa4AgYlYuT62bOA0qzODQcTWYqE6ydDzVMJbOniqZHifhM0/PBcSK0NnhGc8Rsb eQ2LvTN1ji0TxDmOTDlqLcVfCEQck/X5VRj77HoL0yTRtMkPqSwC6ppibxCboQpo4OW4 CcCtJ2TwSHWk1lxU7kaz/8ZKRhZ480uyliCuGk+SvaAJ/OQdR8vjheOfPZUcrfP+C6Nl oW1F7gR/72Ug23BOfPgKKSFu5EePXt3rdklLai0CUDckxaDpPizs9ISy13psDQqiLzrk D8r+BXBLW9aIZsqne54yQKHoxxpNcDYdxFFyoKj7iF9wTmLVl5qRHzcVrEaDBZNdo5A4 MpLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=P20HPBrZHkTF9kEIS2PI4L3s/G3c7QoSVBaJ6Ft7dUk=; b=d6CwqBKf7itgU0RdtoIRbw2Hue/QPvDRKoPsPbrFnyy14l7h1d0gdOBuMTYvzhoT2n E3CoKS1J4fKReQVcRb4cgHOk5YtIhT280fRLguxDHTiiXeHW6B/Px0b/hRyiJ71YoQpg lhj+QxpQ1dTMz0rWwdKBgZ0p5YKxSkDRUZyu2wIZ7Bg3BdBr+76d3JxocjJpZ+NX/A0W iViGL1Bm7xkXuzfSEZmr3BfBZmhcAS3wiYm8tzRudcmAjrYnsyODm4EhGcHD25TUcRWf 6Zb/0YuCucDTwXvyUlp8LU0OLPhEGKemOBGfL2GBt3vBO1lwZ8nIbKt07A1UvFQcIENA ZPWw== ARC-Authentication-Results: i=1; mx.google.com; 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 kw7-20020a170907770700b006ccb88d08dcsi10391968ejc.441.2022.03.15.02.06.36; Tue, 15 Mar 2022 02:06:36 -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; 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 7666168B1CA; Tue, 15 Mar 2022 11:05:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5713168B1A5 for ; Tue, 15 Mar 2022 11:05:51 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id F14382404FE for ; Tue, 15 Mar 2022 10:05:50 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id NsQq-FHJUypg for ; Tue, 15 Mar 2022 10:05:48 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 94753240506 for ; Tue, 15 Mar 2022 10:05:46 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 0C4E03A0631; Tue, 15 Mar 2022 10:05:46 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 10:05:25 +0100 Message-Id: <20220315090532.27295-3-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220315090532.27295-1-anton@khirnov.net> References: <20220315090532.27295-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/10] fftools: drop useless indirection 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: j0E4v/qsltFb --- fftools/cmdutils.c | 4 ++-- fftools/cmdutils.h | 2 -- fftools/ffmpeg.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4b50e15eef..0ac98852fe 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1961,7 +1961,7 @@ static void show_help_filter(const char *name) count = avfilter_filter_pad_count(f, 0); for (i = 0; i < count; i++) { printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i), - media_type_string(avfilter_pad_get_type(f->inputs, i))); + av_get_media_type_string(avfilter_pad_get_type(f->inputs, i))); } if (f->flags & AVFILTER_FLAG_DYNAMIC_INPUTS) printf(" dynamic (depending on the options)\n"); @@ -1972,7 +1972,7 @@ static void show_help_filter(const char *name) count = avfilter_filter_pad_count(f, 1); for (i = 0; i < count; i++) { printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i), - media_type_string(avfilter_pad_get_type(f->outputs, i))); + av_get_media_type_string(avfilter_pad_get_type(f->outputs, i))); } if (f->flags & AVFILTER_FLAG_DYNAMIC_OUTPUTS) printf(" dynamic (depending on the options)\n"); diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index f460cb028e..57db531f5c 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -633,8 +633,6 @@ void *grow_array(void *array, int elem_size, int *size, int new_size); */ void *allocate_array_elem(void *array, size_t elem_size, int *nb_elems); -#define media_type_string av_get_media_type_string - #define GROW_ARRAY(array, nb_elems)\ array = grow_array(array, sizeof(*array), &nb_elems, nb_elems + 1) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 9a3fdc636d..eaca897aec 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1606,7 +1606,7 @@ static void print_final_stats(int64_t total_size) total_packets += ist->nb_packets; av_log(NULL, AV_LOG_VERBOSE, " Input stream #%d:%d (%s): ", - i, j, media_type_string(type)); + i, j, av_get_media_type_string(type)); av_log(NULL, AV_LOG_VERBOSE, "%"PRIu64" packets read (%"PRIu64" bytes); ", ist->nb_packets, ist->data_size); @@ -1640,7 +1640,7 @@ static void print_final_stats(int64_t total_size) total_packets += ost->packets_written; av_log(NULL, AV_LOG_VERBOSE, " Output stream #%d:%d (%s): ", - i, j, media_type_string(type)); + i, j, av_get_media_type_string(type)); if (ost->encoding_needed) { av_log(NULL, AV_LOG_VERBOSE, "%"PRIu64" frames encoded", ost->frames_encoded);