[FFmpeg-cvslog] http: Reorder two code blocks

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Nov 10 14:55:18 2011 +0200| [f5c5d57b57ba74be4d8475d729675e464ed4ecb9] | committer: Martin Storsjö

http: Reorder two code blocks

This is in preparation for a later commit.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5c5d57b57ba74be4d8475d729675e464ed4ecb9
---

 libavformat/http.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libavformat/http.c b/libavformat/http.c
index 5941925..45253d4 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -110,6 +110,14 @@ static int http_open_cnx(URLContext *h)
                  path1, sizeof(path1), s->location);
     ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, hostname, port, NULL);
 
+    if (!strcmp(proto, "https")) {
+        lower_proto = "tls";
+        if (port < 0)
+            port = 443;
+    }
+    if (port < 0)
+        port = 80;
+
     if (path1[0] == '\0')
         path = "/";
     else
@@ -124,13 +132,6 @@ static int http_open_cnx(URLContext *h)
         av_url_split(NULL, 0, proxyauth, sizeof(proxyauth),
                      hostname, sizeof(hostname), &port, NULL, 0, proxy_path);
     }
-    if (!strcmp(proto, "https")) {
-        lower_proto = "tls";
-        if (port < 0)
-            port = 443;
-    }
-    if (port < 0)
-        port = 80;
 
     ff_url_join(buf, sizeof(buf), lower_proto, NULL, hostname, port, NULL);
     err = ffurl_open(&hd, buf, AVIO_FLAG_READ_WRITE,