From patchwork Sun Jun 18 11:16:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 42184 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp56326pzb; Sun, 18 Jun 2023 04:20:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5G3vcdhYQILnbAt0H0mVzF85ecGpm4EJIAtUiS5alYkEpZLOpkUXjf7zvxuB82SnLUFT3w X-Received: by 2002:a17:907:a04:b0:988:8fce:17ba with SMTP id bb4-20020a1709070a0400b009888fce17bamr475430ejc.31.1687087224518; Sun, 18 Jun 2023 04:20:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687087224; cv=none; d=google.com; s=arc-20160816; b=AzCW1pk4ybsCJVlF8elRkOeJYetna8oqjEZMNrvmEOMZn6QhGaGYUCV7/YPECCRGSe I6Ue0yAh3hzKwRqJe67rSMZ5jMrV+aA9X6N+yLeTyKjxK6rpjo7jKFXUk93X+0x9rcbc P7+vPNYIGN+mS0FC/lO3Yg+tLeJ+jS0ox70Z+VyMxYziHI6b02SS5GilwbSuottQ1SZP yJNuiuCMbufoT3BBF1Nw4xR89qieq/GZVAjchNYLQjJaL4wln1g6Kf7R/97SPLQRPlI0 9f+ge/Btf4fvFms0hmQQ/1FftyQlyTVrFuddSrsNy+LRcmET968FVy1Z14o8I1J/VOMv SMLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=QcXHjSEq1mH8/L1bQ4dUenQh8EK8zkKGR/i2l9S3SOU=; b=ypvPrJ88pNLPfEF9vamDrjtU04wJbnEv4pSVWbZHyuAWFypSH88OVnrHaJjsWVyIOs bNsaoL4RoZE+LsbP23OlFxOF0EN/JcLhd6jQOP8krO+r6pRQxVmesW6dV3mLyHH6AZYO ic5AAOHDGmmeZSbd1Ln2OrUDxqLAwWm/KLkD2QOygLAAuxuovYsyWgy9XYT2O5OZpf52 A7fzz9MsGZsUi8RtAjEFArZeDkGPWIo60k+U3/P7qa+DS2ZoZAnrlROULJgFix5K+Z39 +wIoesCPK6Xh9IkzLkY9KRv4rwhGTMg/HlxL+R7p2CyITVctsbjXaIXSJqxb0OyOkF1P YQ/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=j4mM6bc5; 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 w12-20020aa7d28c000000b005149d398b2bsi12610666edq.585.2023.06.18.04.20.24; Sun, 18 Jun 2023 04:20:24 -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=@haasn.xyz header.s=mail header.b=j4mM6bc5; 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 51D2268BF7D; Sun, 18 Jun 2023 14:20:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A697F68BF50 for ; Sun, 18 Jun 2023 14:20:08 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 6B89C42350; Sun, 18 Jun 2023 13:20:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1687087208; bh=WAm6lPWXPVKyVWWiTpC2BSGDJdXtOQ03zruHClRamIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j4mM6bc5UWGnxqB7LIT1uhAlWl6tuxCOytL0mmH0j1k3nlH/b4dGCjXGYgD0TlXKO PBzvD8qAqwfFcs3ZW2u0atMKKEH5fgRSbGZO6opMNaBRPvy96reEZYXoTiD6rpsvWb GvFGaxLq85BQLyHr950SkrOHa9Yv9d6Ymkidy1ro= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jun 2023 13:16:53 +0200 Message-ID: <20230618111955.40994-3-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230618111955.40994-2-ffmpeg@haasn.xyz> References: <20230618111955.40994-2-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 01/22] lavfi/vf_libplacebo: drop redundant case 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FWtgz/C0NA1M From: Niklas Haas If the input queue is EOF, then the s->status check should already have covered it, and prevented the code from getting this far. If we still hit this case for some reason, it's probably a bug. Better to hit the AVERROR_BUG branch. --- libavfilter/vf_libplacebo.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 242c8a13f5a..a048424cecc 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -949,9 +949,6 @@ static int libplacebo_activate(AVFilterContext *ctx) if (!s->fps.num) av_fifo_drain2(s->out_pts, 1); return output_frame_mix(ctx, &mix, pts); - case PL_QUEUE_EOF: - ff_outlink_set_status(outlink, AVERROR_EOF, pts); - return 0; case PL_QUEUE_ERR: return AVERROR_EXTERNAL; }