diff options
| author | Martin Storsjö <martin@martin.st> | 2010-06-19 21:56:50 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-06-19 21:56:50 +0000 |
| commit | a955fc5ee756b417eda0f1afbfaa69c4c6aafaa6 (patch) | |
| tree | 1ded26ee2c3fc621e0ce57d67297ea596f4223b8 /libavformat/utils.c | |
| parent | 6217b6451ad2e730d774d033ca7e77b59c3d66b3 (diff) | |
| download | ffmpeg-a955fc5ee756b417eda0f1afbfaa69c4c6aafaa6.tar.gz | |
ff_url_join: Don't add any at-char if the auth is an empty string
Originally committed as revision 23650 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 9faa566a8c..59ca6bbde4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3601,7 +3601,7 @@ int ff_url_join(char *str, int size, const char *proto, str[0] = '\0'; if (proto) av_strlcatf(str, size, "%s://", proto); - if (authorization) + if (authorization && authorization[0]) av_strlcatf(str, size, "%s@", authorization); #if CONFIG_NETWORK && defined(AF_INET6) /* Determine if hostname is a numerical IPv6 address, |