summaryrefslogtreecommitdiff
path: root/libavformat/avio.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-31 16:04:59 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-04 17:45:19 +0200
commit5652bb94719c0bb0c58f73e44531af9977493223 (patch)
tree4c9d488b2d072c63def12e5769c831536461abc7 /libavformat/avio.c
parent0d8a33b11e605f7fb6b51640d438d41fec08db1c (diff)
avio: make url_alloc internal.
Diffstat (limited to 'libavformat/avio.c')
-rw-r--r--libavformat/avio.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c
index f6f067d63f..c0198ccbfb 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -29,6 +29,7 @@
#if CONFIG_NETWORK
#include "network.h"
#endif
+#include "url.h"
#if FF_API_URL_CLASS
/** @name Logging context. */
@@ -167,6 +168,10 @@ int url_open_protocol (URLContext **puc, struct URLProtocol *up,
*puc = NULL;
return ret;
}
+int url_alloc(URLContext **puc, const char *filename, int flags)
+{
+ return ffurl_alloc(puc, filename, flags);
+}
#endif
#define URL_SCHEME_CHARS \
@@ -174,7 +179,7 @@ int url_open_protocol (URLContext **puc, struct URLProtocol *up,
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
"0123456789+-."
-int url_alloc(URLContext **puc, const char *filename, int flags)
+int ffurl_alloc(URLContext **puc, const char *filename, int flags)
{
URLProtocol *up;
char proto_str[128], proto_nested[128], *ptr;
@@ -204,7 +209,7 @@ int url_alloc(URLContext **puc, const char *filename, int flags)
int url_open(URLContext **puc, const char *filename, int flags)
{
- int ret = url_alloc(puc, filename, flags);
+ int ret = ffurl_alloc(puc, filename, flags);
if (ret)
return ret;
ret = url_connect(*puc);