Mercurial > libavformat.hg
changeset 5776:d34f985d6e8f libavformat
Reindent
| author | mstorsjo |
|---|---|
| date | Mon, 08 Mar 2010 09:05:03 +0000 |
| parents | 7a123cc24a81 |
| children | afceb57d364c |
| files | avformat.h gopher.c http.c rtmpproto.c rtpproto.c rtsp.c utils.c |
| diffstat | 7 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Mon Mar 08 09:03:25 2010 +0000 +++ b/avformat.h Mon Mar 08 09:05:03 2010 +0000 @@ -1344,11 +1344,11 @@ attribute_deprecated int resolve_host(struct in_addr *sin_addr, const char *hostname); void ff_url_split(char *proto, int proto_size, - char *authorization, int authorization_size, - char *hostname, int hostname_size, - int *port_ptr, - char *path, int path_size, - const char *url); + char *authorization, int authorization_size, + char *hostname, int hostname_size, + int *port_ptr, + char *path, int path_size, + const char *url); /** * Assembles a URL string from components. This is the reverse operation
--- a/gopher.c Mon Mar 08 09:03:25 2010 +0000 +++ b/gopher.c Mon Mar 08 09:05:03 2010 +0000 @@ -90,7 +90,7 @@ /* needed in any case to build the host string */ ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, - path, sizeof(path), uri); + path, sizeof(path), uri); if (port < 0) port = 70;
--- a/http.c Mon Mar 08 09:03:25 2010 +0000 +++ b/http.c Mon Mar 08 09:05:03 2010 +0000 @@ -70,12 +70,12 @@ redo: /* needed in any case to build the host string */ ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, - path1, sizeof(path1), s->location); + path1, sizeof(path1), s->location); ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, hostname, port, NULL); if (use_proxy) { ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, - NULL, 0, proxy_path); + NULL, 0, proxy_path); path = s->location; } else { if (path1[0] == '\0')
--- a/rtmpproto.c Mon Mar 08 09:03:25 2010 +0000 +++ b/rtmpproto.c Mon Mar 08 09:05:03 2010 +0000 @@ -813,7 +813,7 @@ rt->is_input = !(flags & URL_WRONLY); ff_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, - path, sizeof(path), s->filename); + path, sizeof(path), s->filename); if (port < 0) port = RTMP_DEFAULT_PORT;
--- a/rtpproto.c Mon Mar 08 09:03:25 2010 +0000 +++ b/rtpproto.c Mon Mar 08 09:05:03 2010 +0000 @@ -65,7 +65,7 @@ char path[1024]; ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, - path, sizeof(path), uri); + path, sizeof(path), uri); ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port, "%s", path); udp_set_remote_url(s->rtp_hd, buf); @@ -135,7 +135,7 @@ h->priv_data = s; ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, - path, sizeof(path), uri); + path, sizeof(path), uri); /* extract parameters */ ttl = -1; local_port = -1;
--- a/rtsp.c Mon Mar 08 09:03:25 2010 +0000 +++ b/rtsp.c Mon Mar 08 09:05:03 2010 +0000 @@ -447,7 +447,7 @@ /* XXX: may need to add full url resolution */ ff_url_split(proto, sizeof(proto), NULL, 0, NULL, 0, - NULL, NULL, 0, p); + NULL, NULL, 0, p); if (proto[0] == '\0') { /* relative control URL */ if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/') @@ -1391,7 +1391,7 @@ redirect: /* extract hostname and port */ ff_url_split(NULL, 0, auth, sizeof(auth), - host, sizeof(host), &port, path, sizeof(path), s->filename); + host, sizeof(host), &port, path, sizeof(path), s->filename); if (*auth) { int auth_len = strlen(auth), b64_len = ((auth_len + 2) / 3) * 4 + 1;
--- a/utils.c Mon Mar 08 09:03:25 2010 +0000 +++ b/utils.c Mon Mar 08 09:05:03 2010 +0000 @@ -3366,11 +3366,11 @@ } void ff_url_split(char *proto, int proto_size, - char *authorization, int authorization_size, - char *hostname, int hostname_size, - int *port_ptr, - char *path, int path_size, - const char *url) + char *authorization, int authorization_size, + char *hostname, int hostname_size, + int *port_ptr, + char *path, int path_size, + const char *url) { const char *p, *ls, *at, *col, *brk;