From e52a9145c8bf0748ae970e210e528ff56508964c Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 31 Mar 2011 17:36:06 +0200
Subject: avio: make url_close() internal.

---
 libavformat/avio.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'libavformat/avio.c')

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 8f13e5f6e5..b372ee376d 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -164,7 +164,7 @@ int url_open_protocol (URLContext **puc, struct URLProtocol *up,
     if (!ret)
         return 0;
  fail:
-    url_close(*puc);
+    ffurl_close(*puc);
     *puc = NULL;
     return ret;
 }
@@ -196,6 +196,10 @@ int64_t url_seek(URLContext *h, int64_t pos, int whence)
 {
     return ffurl_seek(h, pos, whence);
 }
+int url_close(URLContext *h)
+{
+    return ffurl_close(h);
+}
 #endif
 
 #define URL_SCHEME_CHARS                        \
@@ -239,7 +243,7 @@ int ffurl_open(URLContext **puc, const char *filename, int flags)
     ret = ffurl_connect(*puc);
     if (!ret)
         return 0;
-    url_close(*puc);
+    ffurl_close(*puc);
     *puc = NULL;
     return ret;
 }
@@ -309,7 +313,7 @@ int64_t ffurl_seek(URLContext *h, int64_t pos, int whence)
     return ret;
 }
 
-int url_close(URLContext *h)
+int ffurl_close(URLContext *h)
 {
     int ret = 0;
     if (!h) return 0; /* can happen when ffurl_open fails */
@@ -330,7 +334,7 @@ int url_exist(const char *filename)
     URLContext *h;
     if (ffurl_open(&h, filename, URL_RDONLY) < 0)
         return 0;
-    url_close(h);
+    ffurl_close(h);
     return 1;
 }
 
-- 
cgit v1.2.3