From patchwork Fri Apr 5 16:11:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47836 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1069691pzd; Fri, 5 Apr 2024 09:14:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW4vjRnyktwU6k889IabwWb3EOLCq/0T4pVkC1cec0CNRuBtZjWWmf8OkL4MErSaQgsyN1vFuwyL5TahyjPpA5J6fKVNW7hoRVUmw== X-Google-Smtp-Source: AGHT+IFJToUq/kFy2PaztK4ULDmkXnCQQj3seMhan/QHQFpgUx/BsnIMyD93TgrMsybA46ttoow3 X-Received: by 2002:a17:906:1390:b0:a51:9341:a37f with SMTP id f16-20020a170906139000b00a519341a37fmr1345500ejc.71.1712333678302; Fri, 05 Apr 2024 09:14:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712333678; cv=none; d=google.com; s=arc-20160816; b=aXH1byIk1yV0279Z+2VGmu1AFe8JMJVfJwwygn0zaaIRZrJbI569HFr97tJLpusq1e cnH2vlU6LhvBVqv1Dc4ybdX0ctbBsmq6scfQ/8DtsoKNyyFKiC9s4CP6rZzol1VFkT0J top/oEnnzJBX/zsG3tVjoi4ZeTAWR+uqCJhrL1cGRz9d9LjlrQP3WaHOiA+0TJA5ruB0 QUKj0mN/jXUi1S0wZTZ+4hyn3ZBSA8E8rkUaVvIWghLXT/lDiXvVw87L/tJqEwVsxrvW J5eopmRLOHtAYx0b5kwZ8pQ09OKct+7Uc+U8E7Imq36StLejlJPw0AfWCDeRDuIHQREM TrFA== 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:dkim-signature:delivered-to; bh=oy2AHXmiwXqix8rehGa+KUJMwah2erqJZv4BZthkevc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=A/zbbAhRuoHPW2lmLpiahbX1jrNAWb3I7F0QBT07I3ZoTM2KCJxOfskhMOmcQGy+/w TxNDKROKI2OTuNXU16zGrGGWMIW37aduWKxpVhgLzMYJoImNtkuUc7T/Q0UEH4yeX1Xa WAxYRokwtPsaEFrAMf6pTRL28MPBtMYd3SGihITtGRam6iKVLVj8OWRKQ+f2tOXQ2U3/ TPstdqV+0qRl/ENFdoNjAJdlunfOdwGa0W1C6QYz3z8voHp0KvZtjTXFHUF7oxTP4UCJ JMcd8enZXzzwtFJ7fEzc3GydvAxb7KcxZYs0Tv+9sfYGJcfnpAjC+2JN4Y9gUXOfCZaw GjGw==; 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=Ya0VC5dn; 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 qx13-20020a170906fccd00b00a51a0a1e87asi820230ejb.175.2024.04.05.09.14.34; Fri, 05 Apr 2024 09:14:38 -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=Ya0VC5dn; 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 3BC8368D202; Fri, 5 Apr 2024 19:13:19 +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 3BCE168D168 for ; Fri, 5 Apr 2024 19:13:10 +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=Ya0VC5dn; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 288974D7C for ; Fri, 5 Apr 2024 18:13:06 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id dQP0dKCBvQKs for ; Fri, 5 Apr 2024 18:13:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1712333582; bh=c8RF8cb8P68x1fKu9/fqzJQ+wLWHY8HLJ2lzY9FOYS4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Ya0VC5dntZflv097WyTmIKIII0r1f4s8HYtUhqN2qxbGECEtO15pzx566U10m3DEY hggeKFPkmXl3md695Dapr9U3ZDLWJrk070BfKcuBoUOITGLFXUYKYQzoGqwUw6FoqU Di28TjTyYo9/xUOL8iVPWxiHB9hha2yqmRdsDSrv2nqaRJEIHgrW2GnTPn16jCtpBJ HfJrY3/otAmZp3py7D0q9Jcc+1WobK3ichqZekZ9oVfUXvgaSYPaBmgF2Avc9/F7uo IpiIq48FXOm5yOFVqaMJxKXCcEhHTWlcPm/8Qozg8BJMc1s9Fk4Y7QsqkPnkDrOE39 UWwhyae5CHxHA== 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 737F34D8C for ; Fri, 5 Apr 2024 18:13:02 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 46D023A1581 for ; Fri, 5 Apr 2024 18:12:56 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 18:11:59 +0200 Message-ID: <20240405161212.26167-18-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240405161212.26167-1-anton@khirnov.net> References: <20240405161212.26167-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/31] fftools/ffmpeg_filter: drop an unnecessary use of OutputStream 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: CE6fR6tCoHOL OutputFilter.type contains the same information. --- fftools/ffmpeg_filter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 840502bd62..d2fd26af7e 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -2325,7 +2325,6 @@ static int fg_output_step(OutputFilterPriv *ofp, FilterGraphThread *fgt, AVFrame *frame) { FilterGraphPriv *fgp = fgp_from_fg(ofp->ofilter.graph); - OutputStream *ost = ofp->ofilter.ost; AVFilterContext *filter = ofp->filter; FrameData *fd; int ret; @@ -2379,7 +2378,7 @@ static int fg_output_step(OutputFilterPriv *ofp, FilterGraphThread *fgt, if (!fgp->is_meta) fd->bits_per_raw_sample = 0; - if (ost->type == AVMEDIA_TYPE_VIDEO) { + if (ofp->ofilter.type == AVMEDIA_TYPE_VIDEO) { if (!frame->duration) { AVRational fr = av_buffersink_get_frame_rate(filter); if (fr.num > 0 && fr.den > 0)