From patchwork Fri Jan 29 05:23:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25248 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2777644B9D9 for ; Fri, 29 Jan 2021 07:33:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E67068A767; Fri, 29 Jan 2021 07:33:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 828A86899DD for ; Fri, 29 Jan 2021 07:33:08 +0200 (EET) Received: by mail-wm1-f48.google.com with SMTP id u14so6207525wmq.4 for ; Thu, 28 Jan 2021 21:33:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IXCTHsc/tFTXWK5e8nq1Oe+g6LWn18ugeMrSJb7EJxY=; b=GpD+yDannPYSeUi51lIzar4s/YeD9dFZm10v0xYkRq2cMAZ7QwkVTaQHMlm34DEy60 dBt9eR5RztMkP9PwFlNSEdwQLj6qjnCLK4l+KObeha0rzNa1HaOYjMMYVcspNTzUhfqr V8ktdOFTj218hC2P879c4YyF5lhF8hg7lpXAQFNCQhp/41fPrmS6PtHAQhKIHvKNaqPk AwftkV42fPcTnTCTslsBnEvfRuy3zP8kH/OpheLwuhLkxuzJkGqRb1RXfN6fX8fQDj8/ XVQOWuqPpWeY/avOn9U6zzmzK/0SCf4l5xpRDEQpltf1rRlP0mp5C+cnhrMmzBJ7+k5C krnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IXCTHsc/tFTXWK5e8nq1Oe+g6LWn18ugeMrSJb7EJxY=; b=Dg5EorCVROZHp4QbnsD1wvJUXv3zGuPHzPdfrQ0wrsLT9Z+fchPa/HUFDFrgJrmfnr hySwRzP2RvO737TfRrGXYDrKOvIPO39gRjwKXWW8srDh8Jw3UR2PkOprMbjcbHKu/NvP PKCObsxBEPv2HxMS+U6C44MwjchbeN0kzzgMdN7tktU39DwxdV30dk1YLszlw8oqZJ1Z PccecHajLPWcdQRVQbuREG9oEjo33weo86sse2elcvqPWlj4O64WuHRNbyjZbIcDCJ1L AswpkZd/O8lHIxP147xjKLVJASyzvO6SEV5le5252XuJnL7k7HbmpJ6EKB/6xIi4OIpK Ytqw== X-Gm-Message-State: AOAM530sBeRvjoKie5vO8j+1XVpRmyw1LqxUxIOvCRau0d22OOboG5Z/ nKRKWLAtQFA7i8MHa01U6RVR5ziXGLk= X-Google-Smtp-Source: ABdhPJz4MgYZnUZ6ezRIiNhDgL2HWQ3UG2XoyVPzggW96sc/Ntl7P5BTMfcPM7U9G3KwJT9bcw9Auw== X-Received: by 2002:a05:600c:20c:: with SMTP id 12mr2077112wmi.125.1611897986487; Thu, 28 Jan 2021 21:26:26 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id d13sm10068611wrx.93.2021.01.28.21.26.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 21:26:25 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jan 2021 06:23:02 +0100 Message-Id: <20210129052302.3124447-13-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> References: <20210129052302.3124447-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/13] fftools/ffmpeg_filter: Make functions only used locally static X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also remove some declarations of inexistent functions while at it. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.h | 7 ------- fftools/ffmpeg_filter.c | 5 +++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index fa726575f4..5aeceae6b7 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -640,21 +640,14 @@ extern HWDevice *filter_hw_device; void term_init(void); void term_exit(void); -void reset_options(OptionsContext *o, int is_input); void show_usage(void); -void opt_output_file(void *optctx, const char *filename); - void remove_avoptions(AVDictionary **a, AVDictionary *b); void assert_avoptions(AVDictionary *m); int guess_input_channel_layout(InputStream *ist); -enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *avctx, - const AVCodec *codec, enum AVPixelFormat target); - int configure_filtergraph(FilterGraph *fg); -int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out); void check_filter_outputs(void); int filtergraph_is_simple(FilterGraph *fg); int init_simple_filtergraph(InputStream *ist, OutputStream *ost); diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index aff0ebe6ab..22a33e4697 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -60,7 +60,7 @@ static const enum AVPixelFormat *get_compliance_unofficial_pix_fmts(enum AVCodec } } -enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, +static enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, const AVCodec *codec, enum AVPixelFormat target) { if (codec && codec->pix_fmts) { @@ -652,7 +652,8 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, return 0; } -int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) +static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, + AVFilterInOut *out) { if (!ofilter->ost) { av_log(NULL, AV_LOG_FATAL, "Filter %s has an unconnected output\n", ofilter->name);