summaryrefslogtreecommitdiff
path: root/libavformat/avio.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-31 16:10:50 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-04 17:45:20 +0200
commit62eaaeacb5ac083d9a96e95ec7df12113cd3ca81 (patch)
tree8772497d42fbd2c746a22b382cb05afaf9d71ea5 /libavformat/avio.c
parent5652bb94719c0bb0c58f73e44531af9977493223 (diff)
avio: make url_connect internal.
Diffstat (limited to 'libavformat/avio.c')
-rw-r--r--libavformat/avio.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c
index c0198ccbfb..5a6c53ba23 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -137,7 +137,7 @@ static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up,
return err;
}
-int url_connect(URLContext* uc)
+int ffurl_connect(URLContext* uc)
{
int err = uc->prot->url_open(uc, uc->filename, uc->flags);
if (err)
@@ -160,7 +160,7 @@ int url_open_protocol (URLContext **puc, struct URLProtocol *up,
ret = url_alloc_for_protocol(puc, up, filename, flags);
if (ret)
goto fail;
- ret = url_connect(*puc);
+ ret = ffurl_connect(*puc);
if (!ret)
return 0;
fail:
@@ -172,6 +172,10 @@ int url_alloc(URLContext **puc, const char *filename, int flags)
{
return ffurl_alloc(puc, filename, flags);
}
+int url_connect(URLContext* uc)
+{
+ return ffurl_connect(uc);
+}
#endif
#define URL_SCHEME_CHARS \
@@ -212,7 +216,7 @@ int url_open(URLContext **puc, const char *filename, int flags)
int ret = ffurl_alloc(puc, filename, flags);
if (ret)
return ret;
- ret = url_connect(*puc);
+ ret = ffurl_connect(*puc);
if (!ret)
return 0;
url_close(*puc);