From patchwork Fri Jul 7 02:18:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wan-Teh Chang X-Patchwork-Id: 4252 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2940298vsb; Thu, 6 Jul 2017 19:28:10 -0700 (PDT) X-Received: by 10.223.150.163 with SMTP id u32mr44707796wrb.195.1499394489951; Thu, 06 Jul 2017 19:28:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499394489; cv=none; d=google.com; s=arc-20160816; b=ocfflkc3rKQH5fY3blVnaLiE5/0E7Onwt1jg12jbkcOemjTUPKlZ32S874FiNkd0Vo eVhaJeD16VOJajvG4apDhdH8+pkgZVgVNaZ9atm8zWoJc85vA2ApLrTEi8P5kv0kVG7e rnouxEFa3Z1NT0lig7mzfWa/80F3jqZ9iEuCdKUwzpIH4+avRTbzoYfftdNkYRqXceTG Kk/5e3lZ8dwTXwtvVN91SXp75RluArC2BnV28I8vVhW4ewn059U6J4EwlOrEsRsl6KO9 wWmlLHmvWoYEvfAY+vsqm3SFoJW1O6D+s/S3lgQfaI3E8sj6HCPcAOmfmh4oU7M7AFJb Jjog== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=yTOz5jnkoF+rPht4xkwWP0TTjaybMn0sYftkGaT9Y9A=; b=kXg9y/NrxvyGDNJE6XWMTtwUI5MZgIXmfnROLUTxBS7yiBWEw/j6Ndc/F2u+Cc8gKj MlLcEocv4PgjnjsE+W21YBg8h6t3SfKMm0qwR1MkVRQXiFY717SVOHiV5eoUhldeF31h tXJHgqFT41P610A2dJLL/ZYcefrUgsAcjFKEJzpQjYWm0zxh6hUOdDudS/0lk8C37vwp qMpbQ4UrXGbj1/EC1LvQYdinVK1ew9KQ2JPXLaN6sBhCyKJFbWbFejBYd0ate6CVbQVz LPEHI2CkrYIfS/KUWY3zm0ufEq7KWxBh/q2LwMfcd/LWH8ln1bQmtxlccvCMh+BcX9+x oMTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.b=Io4J2paB; 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 q3si1744005wme.46.2017.07.06.19.28.09; Thu, 06 Jul 2017 19:28:09 -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=@google.com header.b=Io4J2paB; 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 3CC14689933; Fri, 7 Jul 2017 05:28:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f42.google.com (mail-pg0-f42.google.com [74.125.83.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC9B768838B for ; Fri, 7 Jul 2017 05:27:57 +0300 (EEST) Received: by mail-pg0-f42.google.com with SMTP id u62so9737738pgb.3 for ; Thu, 06 Jul 2017 19:28:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:subject:date:message-id; bh=NGYQp/Bo2M6kWLA2YFsYLdvyOLrVtYN2Xg7RcO9CiWM=; b=Io4J2paBtpFdfi9wOQkwAqXU6LtE8yHN1Ab3bV8djQaNSFWY5N0vpNfh2H5PkAgFHD n16CExpUckMawAK+w/D3dPnrz3wEKI3w0wDU4FBca6PFcxbY7zCH0RPbMN/6xIWZVEq3 oSZ4ANFPCKnbX+EBWqA+YiYLgAJCdkuWld1EjwDsCH3cmagj+Z2f/DiJZS0kG4oSNq77 ToRn/m5JEctMw5zgwymha7WkQO4ExHozqNrdoAbeC93Cc07dwP6vHEceikk/vQ8jILTy jBwPiPFU5w7CSoXGypn0wE2+bWXQEDDP1Jqkf57LWi7qJaEFyOun2cYCCyZCk4XJgnoc 6Pog== 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; bh=NGYQp/Bo2M6kWLA2YFsYLdvyOLrVtYN2Xg7RcO9CiWM=; b=QtOIb5mT9KLe7NkpPxsf1iMoeznvPTMoLC4oYt6GfH6Sv5C7kIKUjV6a0jbCvc7cK3 gbM4kbeMAu8DSsQyLGoHM76QfPRZbywwYCMr2v+/3aEFmwkKCEsRzK+Z2l+FG7dzdUtz pjRsXkBjXKLdNlshsf/+MZi26bRfoFtBDvYjaId8Wn0S+wYtRfU0kpsgtZutrXcjV1Aj sIU2dJzF5YqKeTeQM/Y9Qk8/MfCx09j5UX3G0gfueUwjuNc2L738j2cnpUVpWJBJxoEp Dd1R0uJdohQ6GmejmAegh0qLvPo7WtlnbmpS4XdVkrMgrg3BqWGVB6/w83vp4SrJb2DM nQ2g== X-Gm-Message-State: AIVw110vRkAmg+bC3vTvMab3vCojbGEFkw8oXUpfLpuo6Z5B9xm8Oawh +jupyU8BsatqDgihYITGdA== X-Received: by 10.99.153.26 with SMTP id d26mr29453877pge.241.1499393990301; Thu, 06 Jul 2017 19:19:50 -0700 (PDT) Received: from wtc-desktop.mtv.corp.google.com ([100.98.5.29]) by smtp.googlemail.com with ESMTPSA id 8sm3523470pfs.23.2017.07.06.19.19.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Jul 2017 19:19:48 -0700 (PDT) From: Wan-Teh Chang To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2017 19:18:50 -0700 Message-Id: <20170707021850.128743-1-wtc@google.com> X-Mailer: git-send-email 2.13.2.725.g09c95d1e9-goog Subject: [FFmpeg-devel] [PATCH] avformat/avio: Remove no-op code in url_find_protocol(). X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" In url_find_protocol(), proto_str is either "file" or a string consisting of only the characters in URL_SCHEME_CHARS, which does not include ','. Therefore the strchr(proto_str, ',') call always returns NULL. Note: The code was added in commit 6161c41817f6e53abb3021d67ca0f19def682718. Signed-off-by: Wan-Teh Chang --- libavformat/avio.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 1e79c9dd5c..64248e098b 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -263,8 +263,6 @@ static const struct URLProtocol *url_find_protocol(const char *filename) av_strlcpy(proto_str, filename, FFMIN(proto_len + 1, sizeof(proto_str))); - if ((ptr = strchr(proto_str, ','))) - *ptr = '\0'; av_strlcpy(proto_nested, proto_str, sizeof(proto_nested)); if ((ptr = strchr(proto_nested, '+'))) *ptr = '\0';