[FFmpeg-devel] [PATCH 06/13] avformat/avio: Remove ffurl_open

[Andreas Rheinhardt]

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

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
---
 libavformat/async.c | 6 ++++--
 libavformat/avio.c  | 7 -------
 libavformat/url.h   | 7 ++-----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/libavformat/async.c b/libavformat/async.c
index cc11ec47a0..5a81507ef1 100644
--- a/libavformat/async.c
+++ b/libavformat/async.c
@@ -612,7 +612,8 @@ int main(void)
     /*
      * 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);
 
     size = ffurl_size(h);
@@ -688,7 +689,8 @@ int main(void)
      */
     ffurl_close(h);
     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);
 
     ret = ffurl_read(h, buf, 1);
diff --git a/libavformat/avio.c b/libavformat/avio.c
index 3886ed7a90..fbe07e44bc 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -354,13 +354,6 @@ fail:
     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,
                                          int size, int size_min,
                                          int (*transfer_func)(URLContext *h,
diff --git a/libavformat/url.h b/libavformat/url.h
index 1ef5ca35d5..f13e851a14 100644
--- a/libavformat/url.h
+++ b/libavformat/url.h
@@ -56,8 +56,8 @@ typedef struct URLProtocol {
     int     (*url_open)( URLContext *h, const char *url, int flags);
     /**
      * This callback is to be used by protocols which open further nested
-     * protocols. options are then to be passed to ffurl_open()/ffurl_connect()
-     * for those nested protocols.
+     * protocols. options are then to be passed to ffurl_open_whitelist()
+     * or ffurl_connect() for those nested protocols.
      */
     int     (*url_open2)(URLContext *h, const char *url, int flags, AVDictionary **options);
     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,
                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
  *
-- 
2.25.1