Merge commit '4426540f0c3ee516662f79d0a6ab5b95503b6611'

[ffmpeg] / libavformat / avio_internal.h

diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h
index 1e2a18e16162e9689f2e612d4468f3ea49521a19..3867be6e97b73eee4970172c152d0245d8bf047a 100644 (file)
--- a/libavformat/avio_internal.h
+++ b/libavformat/avio_internal.h
@@ -24,11 +24,6 @@
 
 #include "libavutil/log.h"
 
-typedef struct AVIOInternal {
-    URLContext *h;
-    void *hlsopts;
-} AVIOInternal;
-
 extern const AVClass ff_avio_class;
 
 int ffio_init_context(AVIOContext *s,
@@ -155,7 +150,7 @@ int ffio_open_null_buf(AVIOContext **s);
 
 int ffio_open_whitelist(AVIOContext **s, const char *url, int flags,
                          const AVIOInterruptCB *int_cb, AVDictionary **options,
-                         const char *whitelist);
+                         const char *whitelist, const char *blacklist);
 
 /**
  * Close a null buffer.