[FFmpeg-cvslog] lavf/avio: check for : in filenames for protocols.

[Nicolas George]

ffmpeg | branch: release/0.9 | Nicolas George <nicolas.george at normalesup.org> | Wed Feb 27 19:19:15 2013 +0100| [cbadebd8ccd05e2f7786869d524c289af914eb14] | committer: Carl Eugen Hoyos

lavf/avio: check for : in filenames for protocols.

If the first "special" character in a filename is a comma,
it can introduce protocol options, but only if there is a
colon at the end. Otherwise, it is just a filename with a
comma.

Fix trac ticket #2303.
(cherry picked from commit d9fad53f4b447db1e436dcf3fc4a57e604616e6c)

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

 libavformat/avio.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 67005e3..16700d8 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -296,7 +296,9 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags,
                                      "Missing call to av_register_all()?\n");
     }
 
-    if (filename[proto_len] != ':' &&  filename[proto_len] != ',' || is_dos_path(filename))
+    if (filename[proto_len] != ':' &&
+        (filename[proto_len] != ',' || !strchr(filename + proto_len + 1, ':')) ||
+        is_dos_path(filename))
         strcpy(proto_str, "file");
     else
         av_strlcpy(proto_str, filename, FFMIN(proto_len+1, sizeof(proto_str)));