Reindent

Originally committed as revision 22322 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 0b7936a..9fcb2dc 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -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

diff --git a/libavformat/gopher.c b/libavformat/gopher.c
index abb1748..abef1b0 100644 (file)
--- a/libavformat/gopher.c
+++ b/libavformat/gopher.c
@@ -90,7 +90,7 @@ static int gopher_open(URLContext *h, const char *uri, int flags)
 
     /* 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;

diff --git a/libavformat/http.c b/libavformat/http.c
index 5861794..feeba5f 100644 (file)
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -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')

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 9d3a193..e231488 100644 (file)
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -813,7 +813,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
     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;

diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index 02f050f..bb4aa31 100644 (file)
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -65,7 +65,7 @@ int rtp_set_remote_url(URLContext *h, const char *uri)
     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 char *uri, int flags)
     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;

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index f8387f1..8550bf2 100644 (file)
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -447,7 +447,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
 
             /* 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;
 

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 49b7225..454fdc2 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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,
-               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;