avutil: remove deprecated AVClass.child_class_next

[ffmpeg] / libavformat / url.h

diff --git a/libavformat/url.h b/libavformat/url.h
index ae27da5c73097bd80f7d8d3b2d3cd215933beed7..40e6c1d17c79dd37a2e9dbccc48538cb8d0e2966 100644 (file)
--- 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);
@@ -87,8 +87,8 @@ typedef struct URLProtocol {
                                      int *numhandles);
     int (*url_get_short_seek)(URLContext *h);
     int (*url_shutdown)(URLContext *h, int flags);
-    int priv_data_size;
     const AVClass *priv_data_class;
+    int priv_data_size;
     int flags;
     int (*url_check)(URLContext *h, int mask);
     int (*url_open_dir)(URLContext *h);
@@ -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
  *
@@ -311,9 +308,19 @@ int ff_url_join(char *str, int size, const char *proto,
  * @param size the size of buf
  * @param base the base url, may be equal to buf.
  * @param rel the new url, which is interpreted relative to base
+ * @param handle_dos_paths handle DOS paths for file or unspecified protocol
  */
-void ff_make_absolute_url(char *buf, int size, const char *base,
-                          const char *rel);
+int ff_make_absolute_url2(char *buf, int size, const char *base,
+                         const char *rel, int handle_dos_paths);
+
+/**
+ * Convert a relative url into an absolute url, given a base url.
+ *
+ * Same as ff_make_absolute_url2 with handle_dos_paths being equal to
+ * HAVE_DOS_PATHS config variable.
+ */
+int ff_make_absolute_url(char *buf, int size, const char *base,
+                         const char *rel);
 
 /**
  * Allocate directory entry with default values.
@@ -322,10 +329,6 @@ void ff_make_absolute_url(char *buf, int size, const char *base,
  */
 AVIODirEntry *ff_alloc_dir_entry(void);
 
-#if FF_API_CHILD_CLASS_NEXT
-const AVClass *ff_urlcontext_child_class_next(const AVClass *prev);
-#endif
-
 const AVClass *ff_urlcontext_child_class_iterate(void **iter);
 
 /**