From patchwork Thu May 6 21:22:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 27628 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp38143iof; Thu, 6 May 2021 16:03:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgDmCmafnQZlsU7XyCH6z/7RkPeoriFCKunFykxDkGH538PBSqD90XA+L1zepB5UVvWmOn X-Received: by 2002:aa7:cdd8:: with SMTP id h24mr7868811edw.276.1620342188382; Thu, 06 May 2021 16:03:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620342188; cv=none; d=google.com; s=arc-20160816; b=FyDShbYp2BzQlsXZVBPy0MuVggBxxE7Crxc1jIZYROtgYS9exS+Q1DMCjk9aSahlPx dpohHOk3MNuLUdrMXtJAxcbw5JDnqBLtdlMmXZ2TufoqxfsQjF1il+iLNob+1SKhnAFS VF0kGaJoh4L+Xk8cd2ZxLhkm91A0AhXMoI6LtEsDTz3eSxBnFYzZOQvB/VRxwo3ExM8S CS0gwFVv6oYqFUppsHyRZVtDgcvbOC6M/kQA5Z9tNDUXfU/s7g+EQYTpx09uB/yeY6Cm SL0w/JoFvWv0am1Y4uJQ685ayCnyb9MqvmB8ENitxHTRQCs0kYalg++g13qRFZ9vbfgQ YrDA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=M130en3b/OqigDlHrl2Hsmgt790Xkowe8hHS5FCgbGU=; b=Zu2z5OwwQ5NdJplJh57ng98PxEvNNqANe+HaMI56keq5+x+vbtxIjkrem/syzZH82J XDefZOTrns2hDVAqOCb6QGaU+H1OGSUoU9EB/2hgDRkzI0hSwsjLIWYkweaNQlHciOmL L69AO/OS4P1UbstVo7keJnOdL8nOwog92oQO1uHqbB9uDcJAOmCjlD/ZMjuC4gTOOe51 sp/Z1OjH9wR2e/8p7OmHXAbrmhzxMQpvdQ70qraTJlHo6gqbdXeV88y2ou+SBdAMA24i BR87inVULXhTkIGUPxPnVK70O1ZsgJSbv+5+h2PXXYrGWuhPHxr8uF9GBf/Nu68xMVrg AmLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=dgaKSqGe; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l2si3477049edw.356.2021.05.06.16.03.07; Thu, 06 May 2021 16:03:08 -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=@gmail.com header.s=20161025 header.b=dgaKSqGe; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B6D06802D5; Fri, 7 May 2021 02:03:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9E226802D5 for ; Fri, 7 May 2021 02:02:59 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id s8so7238609wrw.10 for ; Thu, 06 May 2021 16:02:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=24v71Qzs50X7hoYomP5Ls/o4sSR9FQCUaMEAqGWEduk=; b=dgaKSqGe773CNUcwMBCvnkbB8vmdKfVpzZqArz2YZwxyB2KqXdepL47Ib5mqVIztfN ScZTJ0y3Cg5AYL9zH6Z3webkachnKw9Yq3x8vLTHP6STNXKf7ll/YcHis+n/spWd35OL tHKt2dN0jXCVG6iJO+klXeFjto8bizv3RgiHIthv4aL3iEh9qZHfeXDQJiyKSYRZJggk Ur/IZYnczF45AlmoIe6Xq5u/yswrh+kmyUJX5/u2bg6IrfvGJ4Jt5fJjDTyqz82wkkEg AGbGqF7J/Cl8u3pshIYC/HyziFLVJQKHoAqexiQptE5BpamYtAOaF6iMUw5cuSIl9f2S 0iqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=24v71Qzs50X7hoYomP5Ls/o4sSR9FQCUaMEAqGWEduk=; b=shgcbI4zjDpAa0fmHCCRys595IFv/0cSK+6ObzPR6eSiLLdd6wq8q+WjAHeDD06QhE vyEBB75JGGjO01Gnndm66f7EsrgcT2EDtFAgT16/+pDR0he6fbq6FhIkeKqqA9OUJOpK 9f5XoOlBPKo8J6GFyWqAtQjzfzaezw60uC5VELRZhurRQw4o0BURUkl2yhvZFgVkjRAU 3wNLqKr4Qr7XWHdzWNLlMzIQaIcmQuuEy+3R5EY1b2Fxfk1sotkRtGEkD+1sewHXJSkE H6aas+wMZAeTApUX6C4QqCzL1bR2Uqy/Dm0dpjtt4cXiZkTxuj0ople990fsoBtHfYvj rA0g== X-Gm-Message-State: AOAM5314kV1MAs8EaN7Udb2k3YcidVX06U5I12Xgni/Ol1k8i8hW+iai xwXtY3DvvESG1ojaRLLHooy9HxoAZR0= X-Received: by 2002:a05:6512:22d6:: with SMTP id g22mr4294334lfu.406.1620336138223; Thu, 06 May 2021 14:22:18 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id z41sm955701lfu.88.2021.05.06.14.22.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 May 2021 14:22:17 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 00:22:15 +0300 Message-Id: <20210506212215.7931-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffmpeg: return no chosen output if an uninitialized stream is unavailable 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: o0YIVd31rMkL Otherwise the rate emulation logic in `transcode_step` never gets hit, and the unavailability flag never gets reset, leading to an eternal loop. Fixes #9160 --- fftools/ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 3ad11452da..b3658d8f65 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3958,7 +3958,7 @@ static OutputStream *choose_output(void) ost->st->index, ost->st->id, ost->initialized, ost->inputs_done, ost->finished); if (!ost->initialized && !ost->inputs_done) - return ost; + return ost->unavailable ? NULL : ost; if (!ost->finished && opts < opts_min) { opts_min = opts;