RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-20 09:57:57 +00:00
Code Issues Projects Releases Wiki Activity

avformat/avio: Remove ffurl_open

Browse Source 
It is only used in commented-out (and nonworking) code in async.c.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-01-29 02:06:50 +01:00
parent 5cad6c6e85
commit 7b43646e18
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/async.c
View File

@ -612,7 +612,8 @@ int main(void)
/* /*
* test normal read * test normal read
*/ */
ret = ffurl_open(&h, "async:async-test:", AVIO_FLAG_READ, NULL, NULL); ret = ffurl_open_whitelist(&h, "async:async-test:", AVIO_FLAG_READ,
NULL, NULL, NULL, NULL, NULL);
printf("open: %d\n", ret); printf("open: %d\n", ret);
size = ffurl_size(h); size = ffurl_size(h);
@ -688,7 +689,8 @@ int main(void)
*/ */
ffurl_close(h); ffurl_close(h);
av_dict_set_int(&opts, "async-test-read-error", -10000, 0); av_dict_set_int(&opts, "async-test-read-error", -10000, 0);
ret = ffurl_open(&h, "async:async-test:", AVIO_FLAG_READ, NULL, &opts); ret = ffurl_open_whitelist(&h, "async:async-test:", AVIO_FLAG_READ,
NULL, &opts, NULL, NULL, NULL);
printf("open: %d\n", ret); printf("open: %d\n", ret);
ret = ffurl_read(h, buf, 1); ret = ffurl_read(h, buf, 1);

7
libavformat/avio.c
View File

@ -354,13 +354,6 @@ fail:
return ret; return ret;
} }
int ffurl_open(URLContext **puc, const char *filename, int flags,
const AVIOInterruptCB *int_cb, AVDictionary **options)
{
return ffurl_open_whitelist(puc, filename, flags,
int_cb, options, NULL, NULL, NULL);
}
static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf,
int size, int size_min, int size, int size_min,
int (*transfer_func)(URLContext *h, int (*transfer_func)(URLContext *h,

7
libavformat/url.h
View File

@ -56,8 +56,8 @@ typedef struct URLProtocol {
int (*url_open)( URLContext *h, const char *url, int flags); int (*url_open)( URLContext *h, const char *url, int flags);
/** /**
* This callback is to be used by protocols which open further nested * This callback is to be used by protocols which open further nested
* protocols. options are then to be passed to ffurl_open()/ffurl_connect() * protocols. options are then to be passed to ffurl_open_whitelist()
* for those nested protocols. * or ffurl_connect() for those nested protocols.
*/ */
int (*url_open2)(URLContext *h, const char *url, int flags, AVDictionary **options); int (*url_open2)(URLContext *h, const char *url, int flags, AVDictionary **options);
int (*url_accept)(URLContext *s, URLContext **c); int (*url_accept)(URLContext *s, URLContext **c);
@ -148,9 +148,6 @@ int ffurl_open_whitelist(URLContext **puc, const char *filename, int flags,
const char *whitelist, const char* blacklist, const char *whitelist, const char* blacklist,
URLContext *parent); URLContext *parent);
int ffurl_open(URLContext **puc, const char *filename, int flags,
const AVIOInterruptCB *int_cb, AVDictionary **options);
/** /**
* Accept an URLContext c on an URLContext s * Accept an URLContext c on an URLContext s
* *