Commit edf96d63 authored by Michael Niedermayer's avatar Michael Niedermayer

url: add ffurl_closep() which also sets the context pointer to NULL

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent f89aa675
...@@ -315,8 +315,9 @@ int64_t ffurl_seek(URLContext *h, int64_t pos, int whence) ...@@ -315,8 +315,9 @@ int64_t ffurl_seek(URLContext *h, int64_t pos, int whence)
return ret; return ret;
} }
int ffurl_close(URLContext *h) int ffurl_closep(URLContext **hh)
{ {
URLContext *h= *hh;
int ret = 0; int ret = 0;
if (!h) return 0; /* can happen when ffurl_open fails */ if (!h) return 0; /* can happen when ffurl_open fails */
...@@ -331,10 +332,16 @@ int ffurl_close(URLContext *h) ...@@ -331,10 +332,16 @@ int ffurl_close(URLContext *h)
av_opt_free(h->priv_data); av_opt_free(h->priv_data);
av_freep(&h->priv_data); av_freep(&h->priv_data);
} }
av_free(h); av_freep(hh);
return ret; return ret;
} }
int ffurl_close(URLContext *h)
{
return ffurl_closep(&h);
}
int avio_check(const char *url, int flags) int avio_check(const char *url, int flags)
{ {
URLContext *h; URLContext *h;
......
...@@ -179,11 +179,12 @@ int64_t ffurl_seek(URLContext *h, int64_t pos, int whence); ...@@ -179,11 +179,12 @@ int64_t ffurl_seek(URLContext *h, int64_t pos, int whence);
/** /**
* Close the resource accessed by the URLContext h, and free the * Close the resource accessed by the URLContext h, and free the
* memory used by it. * memory used by it. Also set the URLContext pointer to NULL.
* *
* @return a negative value if an error condition occurred, 0 * @return a negative value if an error condition occurred, 0
* otherwise * otherwise
*/ */
int ffurl_closep(URLContext **h);
int ffurl_close(URLContext *h); int ffurl_close(URLContext *h);
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment