From patchwork Sat Sep 28 09:53:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51901 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp895648vqb; Sat, 28 Sep 2024 02:54:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlLuIOj/JspsEdU0YcKmQ7K7SYEUuzzx8tx20UjmKD9mCpZoN76GtPvhBdpIZ/WDnOUfBZgCfF0b5as5l776Hg@gmail.com X-Google-Smtp-Source: AGHT+IF9DKCPaQSyN4NI5ijuL/2JFCpIgxwKsPmxWKkU8AGvAKppMpzAuHHHR9P+4XTfDPqRXWPd X-Received: by 2002:a05:6512:1046:b0:538:9e1e:b06f with SMTP id 2adb3069b0e04-5389fc46d48mr5317773e87.27.1727517280307; Sat, 28 Sep 2024 02:54:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727517280; cv=none; d=google.com; s=arc-20240605; b=PxWS0X9MJ3LOmls/EOL/pZ2ECTZ6qs2bM97i4h1G0u4w8iZ34aJlA3qOS0s0+5WWRj sTO9rheZ/7SfyCoVSMOFse5lbY6iDNpd3zrl1+C0OlcOsWGPnWU0bLVJLL6GvYmsB6uC g/GT2FPwDNfMKjsXm6PtOoalOiT4IsDcey0EZkO7NzcSzGuR1N76gcKYt1YB6v/V7JXd NreLjuG0sye50HZYWBiMV2XvkcO+X7OKcpoa6r8UC7hzqlzEZozPUVDIdEFhBJjlUofD kNNLdXKNvRrx1rqIOq1TU1EGKWOmrB7ovzTrKl467LttOasoeRdSxNWW4xkrxz6vu2Qt zfFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:message-id:date:to:from :dkim-signature:delivered-to; bh=6igXVkj/GIu7Wi2vm88OX6UyCiYvCzhrbPpMoFDb3sM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=LwOSFOazApLjj/ybuY/uL7Oev28D6LIXBro5L5ndRNDrNd+rMLLEpNk+YzkDIRZdKK pIC0RzX0YHYyZXMq3vFQI06hPQhh3pbFjQFNhRRmGofKKuGTGNXf3k8Bnp4w2O3bfm8o Hh3JITbv/rv/J7iLb1YY8oU+UQTca4A6p4JdMu0PNMFb0eN0wWnH/3hGbcxD0Uyn22nU w4rPTw4g/KBnRRPSuNU1s1Rvf+BV6ijxzjXmGw0uB+g0md3PrDUVqDsASgcXviLRTC2X +Uy0wxh4gf/g8UeZOXKDKv2HMlUE2CALXJ5YaSMkHtjKHKeTEi1peYtNmfi0WguPEkep LrvQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=J09qMy+2; 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 38308e7fff4ca-2f9d460c14fsi12294041fa.345.2024.09.28.02.54.39; Sat, 28 Sep 2024 02:54:40 -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=@khirnov.net header.s=mail header.b=J09qMy+2; 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 03E4468DB62; Sat, 28 Sep 2024 12:54:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA02B68DA92 for ; Sat, 28 Sep 2024 12:53:56 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=J09qMy+2; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id DE11B4E18 for ; Sat, 28 Sep 2024 11:53:55 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id oj2LagJp1xWi for ; Sat, 28 Sep 2024 11:53:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727517234; bh=H9SVrTWi2Ku3ZuSZBU7tXzzTVaE/Pv+cbJv9vkYakxk=; h=From:To:Subject:Date:From; b=J09qMy+2J2DwY2211EH+JlCSNlR524Q6Z11HkXAQWAXwFSTfgS/t5kfmd3TnRSDSr aMGOX8IxJiH7mj0G8U6hM0PjQt4hcEaCZnIbWEcZQJxtWCY3d3o+P1bDpI5kTCpoUF Dr6052AnXgn+rTySlYPdGSSdJShYghWe/Njr0thitO62CF6d8eYfv3RLkhjps5SUCe vDibavlC6rLowZw6cVT2GZvtnio/pVZbxjO4WbEY5sVNyyriVRmrc6jAq+EpCLGhNt BLtF08sJJ0Y8iYqW2j9ioc6h2BNp/WPi1pu/jYlZU4QueLCAEPKhtoTBd2WID8UkqY h3G7TAQJVbRsw== 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 mail1.khirnov.net (Postfix) with ESMTPS id B549D4D9D for ; Sat, 28 Sep 2024 11:53:54 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 532403A0229 for ; Sat, 28 Sep 2024 11:53:48 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Sep 2024 11:53:33 +0200 Message-ID: <20240928095341.15552-1-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/9] fftools/ffmpeg_demux: drop InputStream.[nb_]outputs 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: BnrWe0D/iKfA It is write-only after d119ae2fd82a494d9430ff4d4fc262961a68c598. --- fftools/ffmpeg.h | 8 -------- fftools/ffmpeg_demux.c | 7 ------- 2 files changed, 15 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index b5c95439e5..13e0fd14cd 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -463,14 +463,6 @@ typedef struct InputStream { * currently video and audio only */ InputFilter **filters; int nb_filters; - - /* - * Output targets that do not go through lavfi, i.e. subtitles or - * streamcopy. Those two cases are distinguished by the OutputStream - * having an encoder or not. - */ - struct OutputStream **outputs; - int nb_outputs; } InputStream; typedef struct InputFile { diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 13aef15eab..9a3ae67e3a 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -840,7 +840,6 @@ static void ist_free(InputStream **pist) av_dict_free(&ds->decoder_opts); av_freep(&ist->filters); - av_freep(&ist->outputs); av_freep(&ds->dec_opts.hwaccel_device); avcodec_parameters_free(&ist->par); @@ -985,12 +984,6 @@ int ist_output_add(InputStream *ist, OutputStream *ost) if (ret < 0) return ret; - ret = GROW_ARRAY(ist->outputs, ist->nb_outputs); - if (ret < 0) - return ret; - - ist->outputs[ist->nb_outputs - 1] = ost; - return ost->enc ? ds->sch_idx_dec : ds->sch_idx_stream; }