summaryrefslogtreecommitdiff
path: root/libavformat/http.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-31 17:36:06 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-04 17:45:20 +0200
commite52a9145c8bf0748ae970e210e528ff56508964c (patch)
tree7fbe99aa17e8bc5d966cc4beadb4b8b2202b5a54 /libavformat/http.c
parent58a48c6511f1aded04885933fdb2449251f0ec64 (diff)
avio: make url_close() internal.
Diffstat (limited to 'libavformat/http.c')
-rw-r--r--libavformat/http.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/http.c b/libavformat/http.c
index 61ae3f438c..bb756c2843 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -134,7 +134,7 @@ static int http_open_cnx(URLContext *h)
goto fail;
if (s->http_code == 401) {
if (cur_auth_type == HTTP_AUTH_NONE && s->auth_state.auth_type != HTTP_AUTH_NONE) {
- url_close(hd);
+ ffurl_close(hd);
goto redo;
} else
goto fail;
@@ -142,7 +142,7 @@ static int http_open_cnx(URLContext *h)
if ((s->http_code == 301 || s->http_code == 302 || s->http_code == 303 || s->http_code == 307)
&& location_changed == 1) {
/* url moved, get next */
- url_close(hd);
+ ffurl_close(hd);
if (redirects++ >= MAX_REDIRECTS)
return AVERROR(EIO);
location_changed = 0;
@@ -151,7 +151,7 @@ static int http_open_cnx(URLContext *h)
return 0;
fail:
if (hd)
- url_close(hd);
+ ffurl_close(hd);
s->hd = NULL;
return AVERROR(EIO);
}
@@ -457,7 +457,7 @@ static int http_close(URLContext *h)
}
if (s->hd)
- url_close(s->hd);
+ ffurl_close(s->hd);
return ret;
}
@@ -493,7 +493,7 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence)
s->off = old_off;
return -1;
}
- url_close(old_hd);
+ ffurl_close(old_hd);
return off;
}