From patchwork Wed Apr 19 19:52:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41262 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp744086pzb; Wed, 19 Apr 2023 12:54:17 -0700 (PDT) X-Google-Smtp-Source: AKy350bW9hq9QnHp0gLc7JwkyJ7R/n8pWRq9zt5wBFnHMGK1WFVj2Q98dsIgZYZyqeuZnCWOPCWZ X-Received: by 2002:a17:906:43c5:b0:94e:cbb7:4f60 with SMTP id j5-20020a17090643c500b0094ecbb74f60mr14075325ejn.19.1681934057079; Wed, 19 Apr 2023 12:54:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681934057; cv=none; d=google.com; s=arc-20160816; b=SXHBL7dYcxbv6dWqMsMK1F53EqYSbWSRfBp/us9ezVe5tgd3sDHwXnwOIV7ULd8y5u YZNJPpHB2N2iRS+7QI22eRuvW01gvjXNCLzeaHqmuns22302MuMKgpfaDpWAQOqm08hD JYhiAWSAXHzMaIUTbDBQVV8nAtAzA9dBKMau3lC5SHHILKKgUfuKLsbm/YmldLj4IZfL bcNSlw/1A3pEKNyp4/xd0ypJ6dlU8y5RT32uFb8KV7eUk4JUk5UB/Z2l6GVeXg5m67AB x0CeBTScKRxhwEC9ZBrP2YwZ+dTOw55+h85xwvv1O9kDLnszK1RUziBqRbHJTE3Zlb+5 jxuA== 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=DcAX9XNXfDfK4JaNy1VTQ2znv0bsjOirgRyDTMdHOzg=; b=IU1qHiPx32eoMhN2S83xwkIHrXU9va9Q0thXgvkhlLXBk10z632ixr/hEGi4OrxwTg n+XMd8wcO2N1IEFxAtugtCXD6BO3reN3hgh4MRUpDNh16MjkyjvanXAEIsXLjJVuWYvI fd27/j22HoCv5kScZZWJ6x/6aevZPdCgdHd82SepzLaH2Hab0xj8j4h9QVXTf867/P4L 9PCUyPrJc5hkKq/v/CkjNDYvNMzXN4PfEyaRboLC5cL+VHHN9OSMWXVbxxOLq14+bEH+ nt3SGQtruwSjSV3pEf+xBQf/992fKYFBmmfN87LIAdlt5ZkF/+PSaaWIhehWoJbNsPmH ajYQ== 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 mf6-20020a1709071a4600b0094f712dac4esi1517306ejc.937.2023.04.19.12.54.16; Wed, 19 Apr 2023 12:54:17 -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 4828B68BF46; Wed, 19 Apr 2023 22:53:13 +0300 (EEST) 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 D9FC868BE96 for ; Wed, 19 Apr 2023 22:53:05 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 17C832404F8 for ; Wed, 19 Apr 2023 21:53:05 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id HSSthoFSWdkn for ; Wed, 19 Apr 2023 21:53:04 +0200 (CEST) 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 65468240D0E for ; Wed, 19 Apr 2023 21:52:56 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id DE9603A037D for ; Wed, 19 Apr 2023 21:52:55 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Apr 2023 21:52:31 +0200 Message-Id: <20230419195243.2974-13-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230419195243.2974-1-anton@khirnov.net> References: <20230419195243.2974-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/25] fftools/ffmpeg: remove unused function arguments 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: sasklqrfC70a --- fftools/ffmpeg_mux.c | 4 ++-- fftools/ffmpeg_mux_init.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index a2e8873ad2..368a7000a9 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -255,7 +255,7 @@ finish: return ret == AVERROR_EOF ? 0 : ret; } -static int queue_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) +static int queue_packet(OutputStream *ost, AVPacket *pkt) { MuxStream *ms = ms_from_ost(ost); AVPacket *tmp_pkt = NULL; @@ -305,7 +305,7 @@ static int submit_packet(Muxer *mux, AVPacket *pkt, OutputStream *ost) return thread_submit_packet(mux, ost, pkt); } else { /* the muxer is not initialized yet, buffer the packet */ - ret = queue_packet(mux, ost, pkt); + ret = queue_packet(ost, pkt); if (ret < 0) { if (pkt) av_packet_unref(pkt); diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index da3dccd6d7..59d9a12c1a 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -839,8 +839,7 @@ static void new_stream_subtitle(Muxer *mux, const OptionsContext *o, } } -static int streamcopy_init(const Muxer *mux, const OptionsContext *o, - OutputStream *ost) +static int streamcopy_init(const Muxer *mux, OutputStream *ost) { MuxStream *ms = ms_from_ost(ost); @@ -1244,7 +1243,7 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o, } if (ost->ist && !ost->enc) { - ret = streamcopy_init(mux, o, ost); + ret = streamcopy_init(mux, ost); if (ret < 0) exit_program(1); } @@ -1946,7 +1945,7 @@ static int copy_chapters(InputFile *ifile, OutputFile *ofile, AVFormatContext *o static int copy_metadata(Muxer *mux, AVFormatContext *ic, const char *outspec, const char *inspec, int *metadata_global_manual, int *metadata_streams_manual, - int *metadata_chapters_manual, const OptionsContext *o) + int *metadata_chapters_manual) { AVFormatContext *oc = mux->fc; AVDictionary **meta_in = NULL; @@ -2050,7 +2049,7 @@ static void copy_meta(Muxer *mux, const OptionsContext *o) in_file_index >= 0 ? input_files[in_file_index]->ctx : NULL, o->metadata_map[i].specifier, *p ? p + 1 : p, &metadata_global_manual, &metadata_streams_manual, - &metadata_chapters_manual, o); + &metadata_chapters_manual); } /* copy chapters */