highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reindent

Browse Source 
Originally committed as revision 22322 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-03-08 09:05:03 +00:00
parent c5c6e67c28
commit f984dcf6dd
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/avformat.h
View File

@ -1344,11 +1344,11 @@ struct in_addr;
attribute_deprecated int resolve_host(struct in_addr *sin_addr, const char *hostname); attribute_deprecated int resolve_host(struct in_addr *sin_addr, const char *hostname);
void ff_url_split(char *proto, int proto_size, void ff_url_split(char *proto, int proto_size,
char *authorization, int authorization_size, char *authorization, int authorization_size,
char *hostname, int hostname_size, char *hostname, int hostname_size,
int *port_ptr, int *port_ptr,
char *path, int path_size, char *path, int path_size,
const char *url); const char *url);
/** /**
* Assembles a URL string from components. This is the reverse operation * Assembles a URL string from components. This is the reverse operation

2
libavformat/gopher.c
View File

@ -90,7 +90,7 @@ static int gopher_open(URLContext *h, const char *uri, int flags)
/* needed in any case to build the host string */ /* needed in any case to build the host string */
ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port,
path, sizeof(path), uri); path, sizeof(path), uri);
if (port < 0) if (port < 0)
port = 70; port = 70;

4
libavformat/http.c
View File

@ -70,12 +70,12 @@ static int http_open_cnx(URLContext *h)
redo: redo:
/* needed in any case to build the host string */ /* needed in any case to build the host string */
ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, 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); ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, hostname, port, NULL);
if (use_proxy) { if (use_proxy) {
ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port, ff_url_split(NULL, 0, auth, sizeof(auth), hostname, sizeof(hostname), &port,
NULL, 0, proxy_path); NULL, 0, proxy_path);
path = s->location; path = s->location;
} else { } else {
if (path1[0] == '\0') if (path1[0] == '\0')

2
libavformat/rtmpproto.c
View File

@ -813,7 +813,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
rt->is_input = !(flags & URL_WRONLY); rt->is_input = !(flags & URL_WRONLY);
ff_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, 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) if (port < 0)
port = RTMP_DEFAULT_PORT; port = RTMP_DEFAULT_PORT;

4
libavformat/rtpproto.c
View File

@ -65,7 +65,7 @@ int rtp_set_remote_url(URLContext *h, const char *uri)
char path[1024]; char path[1024];
ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, 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); ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port, "%s", path);
udp_set_remote_url(s->rtp_hd, buf); udp_set_remote_url(s->rtp_hd, buf);
@ -135,7 +135,7 @@ static int rtp_open(URLContext *h, const char *uri, int flags)
h->priv_data = s; h->priv_data = s;
ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, ff_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port,
path, sizeof(path), uri); path, sizeof(path), uri);
/* extract parameters */ /* extract parameters */
ttl = -1; ttl = -1;
local_port = -1; local_port = -1;

4
libavformat/rtsp.c
View File

@ -447,7 +447,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
/* XXX: may need to add full url resolution */ /* XXX: may need to add full url resolution */
ff_url_split(proto, sizeof(proto), NULL, 0, NULL, 0, ff_url_split(proto, sizeof(proto), NULL, 0, NULL, 0,
NULL, NULL, 0, p); NULL, NULL, 0, p);
if (proto[0] == '\0') { if (proto[0] == '\0') {
/* relative control URL */ /* relative control URL */
if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/') if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/')
@ -1391,7 +1391,7 @@ int ff_rtsp_connect(AVFormatContext *s)
redirect: redirect:
/* extract hostname and port */ /* extract hostname and port */
ff_url_split(NULL, 0, auth, sizeof(auth), 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) { if (*auth) {
int auth_len = strlen(auth), b64_len = ((auth_len + 2) / 3) * 4 + 1; int auth_len = strlen(auth), b64_len = ((auth_len + 2) / 3) * 4 + 1;

10
libavformat/utils.c
View File

@ -3366,11 +3366,11 @@ void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload)
} }
void ff_url_split(char *proto, int proto_size, void ff_url_split(char *proto, int proto_size,
char *authorization, int authorization_size, char *authorization, int authorization_size,
char *hostname, int hostname_size, char *hostname, int hostname_size,
int *port_ptr, int *port_ptr,
char *path, int path_size, char *path, int path_size,
const char *url) const char *url)
{ {
const char *p, *ls, *at, *col, *brk; const char *p, *ls, *at, *col, *brk;