[FFmpeg-cvslog] avformat/avio: Remove no-op code in url_find_protocol().

Wan-Teh Chang git at videolan.org
Mon Jul 10 03:25:04 EEST 2017


ffmpeg | branch: master | Wan-Teh Chang <wtc-at-google.com at ffmpeg.org> | Thu Jul  6 19:18:50 2017 -0700| [2f84f40d451cec38571ef4a0c5d83d642800ce12] | committer: Muhammad Faiz

avformat/avio: Remove no-op code in url_find_protocol().

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 <wtc at google.com>
Signed-off-by: Muhammad Faiz <mfcc64 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f84f40d451cec38571ef4a0c5d83d642800ce12
---

 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';



More information about the ffmpeg-cvslog mailing list