From patchwork Thu Oct 13 13:48:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38719 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp348869pzb; Thu, 13 Oct 2022 06:49:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6JEgecsB+16DxDPzkM7s7R2LO0o8BRwhoWBHFkbhg2rVXjxGDsZP/fhd0651eCof5rHqwf X-Received: by 2002:a17:906:36d1:b0:76c:a723:9445 with SMTP id b17-20020a17090636d100b0076ca7239445mr25833134ejc.548.1665668997535; Thu, 13 Oct 2022 06:49:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665668997; cv=none; d=google.com; s=arc-20160816; b=bVcnSnXmhbJDqZAqw7tZjD97Tz2v7NUiWYRseK4ZL5xO5UlDIromOqG8mMTzPlzck2 tqNC2AO43gInXVo+DTeZYXZuD/jyyW1efBC3fNsm5UF86QqbGbXJLMEh0lDEmhtVCY+a Ly7VuM9xle4s+d+VOpKNm9JQoBHZ7xHjpGqvxtmhG5c4Ju2ak7Mtki/n+uxOH0JuD9Dz TTKix1DkApH+UxIvtgGY05Bkr6Dep2KB/wvP7aNFCGc1/uaBYAVpuB/J1tlmOqkuiUf+ NPzhc0d9IOnRPujv2/NxEfz6A3te4mX0wmrhMw+eG2Y9YJeHRf/qFE9Pr+ZFI3QrE1y/ XTkQ== 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=NHEMtyDpdJjsBTuOQ3cqhdYlH8xlbdl2GzdY/qMRYmQ=; b=i7OSmklu+CiviPa+g+PmfLbC6vTePWx04LJCK2aVfQ9XeVvoUatUuA3pIRQNQIZsXf zgLV566cta1fXeoaoQ85lWxi7eKVn+xJ468nDYF3wNxV9eVjD2P1lytlmjKT7KGUx0xI rsduwSc3a1FKU87p99DqW7S7q7Z5r1uwlG8QVKC28QXL4WakdX3U7tcBOr6TCk06VRpc Nrk0BJBiYnVJjfoMXWJkckXM+nWf1JJaReTvxeKPowfYYiyFx7NiCOQT38oGc2utARwz hhL5rNFk2L6qd5eyESptjEDOvU2ec9kRl2NetY6sLIbpsKSVkWV4qWlbyiglnoIE2vYz WQ/Q== 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 sg15-20020a170907a40f00b0078276be53d5si21406837ejc.0.2022.10.13.06.49.57; Thu, 13 Oct 2022 06:49:57 -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 1C69468BD47; Thu, 13 Oct 2022 16:49:25 +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 BE5C968BCF6 for ; Thu, 13 Oct 2022 16:49:15 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 4624B2404F8 for ; Thu, 13 Oct 2022 15:49:15 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id SRnrvMC7qvL8 for ; Thu, 13 Oct 2022 15:49:13 +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 318B12404F7 for ; Thu, 13 Oct 2022 15:49:13 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 086713A13E9 for ; Thu, 13 Oct 2022 15:49:08 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Oct 2022 15:48:55 +0200 Message-Id: <20221013134904.10104-4-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221013134904.10104-1-anton@khirnov.net> References: <20221013134904.10104-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/13] fftools/ffmpeg_mux: drop the of_ prefix from of_submit_packet() 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: Kd/y7qN6/DTB This function is now static. --- fftools/ffmpeg_mux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 7762038b1d..63f63c0852 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -319,7 +319,7 @@ static int queue_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) return 0; } -static int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) +static int submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) { int ret; @@ -367,12 +367,12 @@ void of_output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof) goto fail; } - ret = of_submit_packet(of, bsf_eof ? NULL : pkt, ost); + ret = submit_packet(of, bsf_eof ? NULL : pkt, ost); if (ret < 0) goto mux_fail; } } else { - ret = of_submit_packet(of, eof ? NULL : pkt, ost); + ret = submit_packet(of, eof ? NULL : pkt, ost); if (ret < 0) goto mux_fail; }