eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

avio: make url_close() internal.

Browse Source
This commit is contained in:
Anton Khirnov
2011-03-31 17:36:06 +02:00
parent 58a48c6511
commit e52a9145c8
16 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/avio.c
View File

@@ -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;
}