[FFmpeg-cvslog] r22322 - in trunk/libavformat: avformat.h gopher.c http.c rtmpproto.c rtpproto.c rtsp.c utils.c
mstorsjo
subversion
Mon Mar 8 10:05:03 CET 2010
Author: mstorsjo
Date: Mon Mar 8 10:05:03 2010
New Revision: 22322
Log:
Reindent
Modified:
trunk/libavformat/avformat.h
trunk/libavformat/gopher.c
trunk/libavformat/http.c
trunk/libavformat/rtmpproto.c
trunk/libavformat/rtpproto.c
trunk/libavformat/rtsp.c
trunk/libavformat/utils.c
Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h Mon Mar 8 10:03:25 2010 (r22321)
+++ trunk/libavformat/avformat.h Mon Mar 8 10:05:03 2010 (r22322)
@@ -1344,11 +1344,11 @@ struct in_addr;
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
Modified: trunk/libavformat/gopher.c
==============================================================================
--- trunk/libavformat/gopher.c Mon Mar 8 10:03:25 2010 (r22321)
+++ trunk/libavformat/gopher.c Mon Mar 8 10:05:03 2010 (r22322)
@@ -90,7 +90,7 @@ static int gopher_open(URLContext *h, co
/* 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;
Modified: trunk/libavformat/http.c
==============================================================================
--- trunk/libavformat/http.c Mon Mar 8 10:03:25 2010 (r22321)
+++ trunk/libavformat/http.c Mon Mar 8 10:05:03 2010 (r22322)
@@ -70,12 +70,12 @@ static int http_open_cnx(URLContext *h)
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')
Modified: trunk/libavformat/rtmpproto.c
==============================================================================
--- trunk/libavformat/rtmpproto.c Mon Mar 8 10:03:25 2010 (r22321)
+++ trunk/libavformat/rtmpproto.c Mon Mar 8 10:05:03 2010 (r22322)
@@ -813,7 +813,7 @@ static int rtmp_open(URLContext *s, cons
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;
Modified: trunk/libavformat/rtpproto.c
==============================================================================
--- trunk/libavformat/rtpproto.c Mon Mar 8 10:03:25 2010 (r22321)
+++ trunk/libavformat/rtpproto.c Mon Mar 8 10:05:03 2010 (r22322)
@@ -65,7 +65,7 @@ int rtp_set_remote_url(URLContext *h, co
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 @@ static int rtp_open(URLContext *h, const
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;
Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c Mon Mar 8 10:03:25 2010 (r22321)
+++ trunk/libavformat/rtsp.c Mon Mar 8 10:05:03 2010 (r22322)
@@ -447,7 +447,7 @@ static void sdp_parse_line(AVFormatConte
/* 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 @@ int ff_rtsp_connect(AVFormatContext *s)
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;
Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c Mon Mar 8 10:03:25 2010 (r22321)
+++ trunk/libavformat/utils.c Mon Mar 8 10:05:03 2010 (r22322)
@@ -3366,11 +3366,11 @@ void av_pkt_dump_log(void *avcl, int lev
}
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;
More information about the ffmpeg-cvslog
mailing list