Mercurial > libavformat.hg
changeset 6147:3877522243ec libavformat
ff_url_join: Don't add any at-char if the auth is an empty string
| author | mstorsjo |
|---|---|
| date | Sat, 19 Jun 2010 21:56:50 +0000 |
| parents | 9f9a4be98cfb |
| children | 06766607951e |
| files | internal.h utils.c |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/internal.h Sat Jun 19 21:46:39 2010 +0000 +++ b/internal.h Sat Jun 19 21:56:50 2010 +0000 @@ -131,7 +131,8 @@ * @param size the size of the str buffer * @param proto the protocol identifier, if null, the separator * after the identifier is left out, too - * @param authorization an optional authorization string, may be null + * @param authorization an optional authorization string, may be null. + * An empty string is treated the same as a null string. * @param hostname the host name string * @param port the port number, left out from the string if negative * @param fmt a generic format string for everything to add after the
--- a/utils.c Sat Jun 19 21:46:39 2010 +0000 +++ b/utils.c Sat Jun 19 21:56:50 2010 +0000 @@ -3601,7 +3601,7 @@ 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,