From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 48E6947F74 for ; Wed, 6 Mar 2024 11:05:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1A6868CD8E; Wed, 6 Mar 2024 13:05:31 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD95C68B5A1 for ; Wed, 6 Mar 2024 13:05:24 +0200 (EET) 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=YGdXUUa1; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 7DB0F4D46 for ; Wed, 6 Mar 2024 12:05:24 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 8qFw8msNrsP0 for ; Wed, 6 Mar 2024 12:05:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709723122; bh=Yormk3XSmJcFShZUII08iRmEUXoWd4H3DhZkyrlOdYc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=YGdXUUa1po4jtfYjCHyjcmFwyRsR7DY6BqVDB+PCYHuCuv3ld9roBPjqONSK0CiL+ TSP4zmf1drUkPlAle453GrUDzVGKMhhW1sfB1YH3Eu9iNiVjmZp4tvAdRnZXKhCySe fEWJq7kFWbMnth6wJ1+xr4GdU8IjKALiYylfsCnrNPPNAfF1ltCV/rplVFXkCemc9X smpvOjgyRfxZLsKxZmltUPEBYUPONesssYt5CRPbiVamb9127j3jRPtuWSC6c8TlvA 8G2lQvsX7fbvt/mVsy3MsemyUeuVKLzkYx0EZFC9jAnOIa02+s7cfUP2BdTrF1jKIR +zCUDxV+2Z3vQ== 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 B01F14D44 for ; Wed, 6 Mar 2024 12:05:22 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 98DB83A076E for ; Wed, 6 Mar 2024 12:05:22 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Mar 2024 12:03:04 +0100 Message-ID: <20240306110319.17339-3-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240306110319.17339-1-anton@khirnov.net> References: <20240306110319.17339-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/18] fftools/ffmpeg_filter: drop unused InputFilterPriv.ist 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Outside of ifilter_bind_ist(), there are no longer any assumptions about about filter inputs being fed by an InputStream. --- fftools/ffmpeg_filter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 9d9762a599..37705297fb 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -109,8 +109,6 @@ typedef struct InputFilterPriv { AVFilterContext *filter; - InputStream *ist; - // used to hold submitted input AVFrame *frame; @@ -125,6 +123,7 @@ typedef struct InputFilterPriv { enum AVMediaType type_src; int eof; + int bound; // parameters configured for this input int format; @@ -664,7 +663,8 @@ static int ifilter_bind_ist(InputFilter *ifilter, InputStream *ist) FilterGraphPriv *fgp = fgp_from_fg(ifilter->graph); int ret, dec_idx; - av_assert0(!ifp->ist); + av_assert0(!ifp->bound); + ifp->bound = 1; if (ifp->type != ist->par->codec_type && !(ifp->type == AVMEDIA_TYPE_VIDEO && ist->par->codec_type == AVMEDIA_TYPE_SUBTITLE)) { @@ -673,7 +673,6 @@ static int ifilter_bind_ist(InputFilter *ifilter, InputStream *ist) return AVERROR(EINVAL); } - ifp->ist = ist; ifp->type_src = ist->st->codecpar->codec_type; dec_idx = ist_filter_add(ist, ifilter, filtergraph_is_simple(ifilter->graph), -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".