From patchwork Wed Aug 11 19:00:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29438 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp46038iod; Wed, 11 Aug 2021 12:02:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrWtCxWb2Ld4Wq8eRU2QTxh7fx4z9gY1Uyn6jhkkLUdYH/w3/B0KmfJgzfYF/8s1eHI72l X-Received: by 2002:a50:fa89:: with SMTP id w9mr473285edr.142.1628708539876; Wed, 11 Aug 2021 12:02:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708539; cv=none; d=google.com; s=arc-20160816; b=ht9eqpwHJ2oiKZygQ7nT6BEXQKy1gsgKcnRQYk6721r5LP3cWcHoDkcq4FiU2Mz5Ys jxeZ97XntaTWNU/l+KK2vbd7KYSQ4boLyB5yV5c87W8e3hu8v3lV0VjjbGSFHiztE+yg W26EYwncJglLCV3VgS+tSp/NJfebAk/d0ZMy4d9NFSt262qXldQxbFKY2XFLOVWT+inT +OUUTiPQHB2uAYiE3oDnhJYgYmgNCgnnGdcri/XnUtd92hFR+oQYwSpI2uhVU/bY0oWS VwDr7nLFtgSlpbif4bSNY45aZmUd/RDsfs+qYiOZ2f5LqUO1ZAvl06T+fGoFgoKYmWXY 2psQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:to :from:date:dkim-signature:delivered-to; bh=SVKp5MaU51c6QRjeFOW61ix83poKmDMwKjq9ftpyqoo=; b=A27gAlYPO7c7/gdSGj2mO3XNwhvMzpig2oOfiN5uK8vuEVD2P1VhQW8sOP/EHzSwUd lmQ7J/xU+gUDeoVZv4E8j4tzfxYJaMg7owKXqkScVboOHKGh1P7VPbq71ZfxtT1SOZ6g JFph/oY8VVkxjrDHHuVv5bfpjOvflVjU1ZdqnHHEa5wJdbjgHpUAUZkfKKNUXZZ676HD RMuVUvY9jRGBeEKY8lAzrT3db2EJGGH6NCa7PlxJqBozDHKwY2UgVI0aXlp6dYA3dhPF NKS73TY2AOYT87W+pSDPaoEPAqNkc8h69OMW0Xy6SxG1Iktw8gDDW4UXqe6AHLzxIdpY F1hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eqWg93kE; 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 bo18si24120919ejb.651.2021.08.11.12.02.16; Wed, 11 Aug 2021 12:02:19 -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=eqWg93kE; 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 8259368A5B3; Wed, 11 Aug 2021 22:01:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2CD268A5C0 for ; Wed, 11 Aug 2021 22:01:14 +0300 (EEST) Received: by mail-lj1-f177.google.com with SMTP id y7so6291195ljp.3 for ; Wed, 11 Aug 2021 12:01:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:date:from:to:message-id:in-reply-to:references; bh=3aZnWfdTV/dGopm88tF72EHrh85Hhqj6rPPljaXnsxI=; b=eqWg93kEm/0Ohg+b+BPcCxMEjmqjZx8x2rryZbT7Wh9A+Kt2C8S8tlWI2GpuQH5+Ay kjQxNFkytPONRxuY7Zxy/UYDGdbKAQewbuvK3V6RWJSIXs9ICfK/JTeeDqQevpgviGzP QBBtktfWqltMcvExnu26S96PoHwbx4omgH8fndccH2IGqnTcFB/N+M+B6S2Z5+Lz91/u Mo7eD+YUksfQrBDIkT2bPsop8fDLdNnZN9XPJP3OJE+nW8gd/uGF+PTMNeR5XMbfDAPt +4e5Jk2Amluno0SMefKLUYHEQt+SCLLq43LTP387x4Y3ef98M10Jy9piJ7W8i7COzv6q qw4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:from:to:message-id:in-reply-to :references; bh=3aZnWfdTV/dGopm88tF72EHrh85Hhqj6rPPljaXnsxI=; b=BaOwDF5V0OPNkjwooFHBImnMK6loDovB0b9nv47KjGTiIz0XYJepWpJA3FJigI1vuQ djE9JufixY6ucpBAbhE/hjz3HT/e/Jci0VzkfHbUBU7n/o9Ds7soES+qNUkVihn8dGND llxUiwzPYlnSRn5nn30ZKVybGHC37Z/AHNGeYIj3+b+tMgDDuPkiyOCY+E7UKkPlP6vZ x6GSyK+SM2f8tGORt3kd6QXdqKmPsbPm60rAms5wECOzN/onxBsmX6oGAEHWiUf3CfGR EsZxuB+WVOYr6GoRdoUC7Cie/OsnM0qHsFT8uoiZSGxcQNXit2daBDzsZJgW6GUb+hqd lsJg== X-Gm-Message-State: AOAM532uPyl1V08+mb4XqIXwTCbEnlicBP2bg7q0K/iZkgHuUr5hLT7b 5npZtXCdaeRV+p/5tIp+/ggyt8lW9BSQxc4HD9j4kQ== X-Received: by 2002:a05:651c:545:: with SMTP id q5mr114554ljp.15.1628708473573; Wed, 11 Aug 2021 12:01:13 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id t1sm18245lfr.95.2021.08.11.12.01.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:01:13 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:10 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: <9f28159bc34b42b8924652babe113a7d@gmail.com> In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.8/3] libavformat/3otocols.c: avio_enum_protocols(): Make the 'else' logic explicit 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: C+j4ys3wtbND --- libavformat/protocols.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 3f8433e317..5828113428 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -99,11 +99,12 @@ iterate: if (!*p) { *opaque = NULL; return NULL; - } + } else { if ((output && (*p)->url_write) || (!output && (*p)->url_read)) { *opaque = (void *)p; return (*p)->name; } + } ++p; goto iterate; }