diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-31 17:36:06 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-04 17:45:20 +0200 |
| commit | e52a9145c8bf0748ae970e210e528ff56508964c (patch) | |
| tree | 7fbe99aa17e8bc5d966cc4beadb4b8b2202b5a54 /libavformat/avio.c | |
| parent | 58a48c6511f1aded04885933fdb2449251f0ec64 (diff) | |
| download | ffmpeg-e52a9145c8bf0748ae970e210e528ff56508964c.tar.gz | |
avio: make url_close() internal.
Diffstat (limited to 'libavformat/avio.c')
| -rw-r--r-- | libavformat/avio.c | 12 |
1 files changed, 8 insertions, 4 deletions
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; } |