Originally committed as revision 22322 to svn://svn.ffmpeg.org/ffmpeg/trunk
Martin Storsjö authored on 2010/03/08 18:05:03... | ... |
@@ -1344,11 +1344,11 @@ struct in_addr; |
1344 | 1344 |
attribute_deprecated int resolve_host(struct in_addr *sin_addr, const char *hostname); |
1345 | 1345 |
|
1346 | 1346 |
void ff_url_split(char *proto, int proto_size, |
1347 |
- char *authorization, int authorization_size, |
|
1348 |
- char *hostname, int hostname_size, |
|
1349 |
- int *port_ptr, |
|
1350 |
- char *path, int path_size, |
|
1351 |
- const char *url); |
|
1347 |
+ char *authorization, int authorization_size, |
|
1348 |
+ char *hostname, int hostname_size, |
|
1349 |
+ int *port_ptr, |
|
1350 |
+ char *path, int path_size, |
|
1351 |
+ const char *url); |
|
1352 | 1352 |
|
1353 | 1353 |
/** |
1354 | 1354 |
* Assembles a URL string from components. This is the reverse operation |
... | ... |
@@ -90,7 +90,7 @@ static int gopher_open(URLContext *h, const char *uri, int flags) |
90 | 90 |
|
91 | 91 |
/* needed in any case to build the host string */ |
92 | 92 |
ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, |
93 |
- path, sizeof(path), uri); |
|
93 |
+ path, sizeof(path), uri); |
|
94 | 94 |
|
95 | 95 |
if (port < 0) |
96 | 96 |
port = 70; |
... | ... |
@@ -70,12 +70,12 @@ static int http_open_cnx(URLContext *h) |
70 | 70 |
redo: |
71 | 71 |
/* needed in any case to build the host string */ |
72 | 72 |
ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, |
73 |
- path1, sizeof(path1), s->location); |
|
73 |
+ path1, sizeof(path1), s->location); |
|
74 | 74 |
ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, hostname, port, NULL); |
75 | 75 |
|
76 | 76 |
if (use_proxy) { |
77 | 77 |
ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, |
78 |
- NULL, 0, proxy_path); |
|
78 |
+ NULL, 0, proxy_path); |
|
79 | 79 |
path = s->location; |
80 | 80 |
} else { |
81 | 81 |
if (path1[0] == '\0') |
... | ... |
@@ -813,7 +813,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) |
813 | 813 |
rt->is_input = !(flags & URL_WRONLY); |
814 | 814 |
|
815 | 815 |
ff_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, |
816 |
- path, sizeof(path), s->filename); |
|
816 |
+ path, sizeof(path), s->filename); |
|
817 | 817 |
|
818 | 818 |
if (port < 0) |
819 | 819 |
port = RTMP_DEFAULT_PORT; |
... | ... |
@@ -65,7 +65,7 @@ int rtp_set_remote_url(URLContext *h, const char *uri) |
65 | 65 |
char path[1024]; |
66 | 66 |
|
67 | 67 |
ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, |
68 |
- path, sizeof(path), uri); |
|
68 |
+ path, sizeof(path), uri); |
|
69 | 69 |
|
70 | 70 |
ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port, "%s", path); |
71 | 71 |
udp_set_remote_url(s->rtp_hd, buf); |
... | ... |
@@ -135,7 +135,7 @@ static int rtp_open(URLContext *h, const char *uri, int flags) |
135 | 135 |
h->priv_data = s; |
136 | 136 |
|
137 | 137 |
ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, |
138 |
- path, sizeof(path), uri); |
|
138 |
+ path, sizeof(path), uri); |
|
139 | 139 |
/* extract parameters */ |
140 | 140 |
ttl = -1; |
141 | 141 |
local_port = -1; |
... | ... |
@@ -447,7 +447,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, |
447 | 447 |
|
448 | 448 |
/* XXX: may need to add full url resolution */ |
449 | 449 |
ff_url_split(proto, sizeof(proto), NULL, 0, NULL, 0, |
450 |
- NULL, NULL, 0, p); |
|
450 |
+ NULL, NULL, 0, p); |
|
451 | 451 |
if (proto[0] == '\0') { |
452 | 452 |
/* relative control URL */ |
453 | 453 |
if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/') |
... | ... |
@@ -1391,7 +1391,7 @@ int ff_rtsp_connect(AVFormatContext *s) |
1391 | 1391 |
redirect: |
1392 | 1392 |
/* extract hostname and port */ |
1393 | 1393 |
ff_url_split(NULL, 0, auth, sizeof(auth), |
1394 |
- host, sizeof(host), &port, path, sizeof(path), s->filename); |
|
1394 |
+ host, sizeof(host), &port, path, sizeof(path), s->filename); |
|
1395 | 1395 |
if (*auth) { |
1396 | 1396 |
int auth_len = strlen(auth), b64_len = ((auth_len + 2) / 3) * 4 + 1; |
1397 | 1397 |
|
... | ... |
@@ -3366,11 +3366,11 @@ void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload) |
3366 | 3366 |
} |
3367 | 3367 |
|
3368 | 3368 |
void ff_url_split(char *proto, int proto_size, |
3369 |
- char *authorization, int authorization_size, |
|
3370 |
- char *hostname, int hostname_size, |
|
3371 |
- int *port_ptr, |
|
3372 |
- char *path, int path_size, |
|
3373 |
- const char *url) |
|
3369 |
+ char *authorization, int authorization_size, |
|
3370 |
+ char *hostname, int hostname_size, |
|
3371 |
+ int *port_ptr, |
|
3372 |
+ char *path, int path_size, |
|
3373 |
+ const char *url) |
|
3374 | 3374 |
{ |
3375 | 3375 |
const char *p, *ls, *at, *col, *brk; |
3376 | 3376 |
|