avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 0845373..5a535f7 100644 (file)
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -136,10 +136,10 @@ void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
 #if FF_API_OLD_AVIO
 /* not implemented */
 attribute_deprecated int url_poll(URLPollEntry *poll_table, int n, int timeout);
 #if FF_API_OLD_AVIO
 /* not implemented */
 attribute_deprecated int url_poll(URLPollEntry *poll_table, int n, int timeout);

-#endif

 
 
 #define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */
 
 
 #define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */

+#endif

 
 typedef struct URLProtocol {
     const char *name;
 
 typedef struct URLProtocol {
     const char *name;

diff --git a/libavformat/url.h b/libavformat/url.h
index eea9678..72c19b6 100644 (file)
--- a/libavformat/url.h
+++ b/libavformat/url.h
@@ -26,6 +26,11 @@
 #define AVFORMAT_URL_H
 
 #include "avio.h"
 #define AVFORMAT_URL_H
 
 #include "avio.h"

+#include "libavformat/version.h"
+
+#if !FF_API_OLD_AVIO
+#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */
+#endif

 
 /**
  * Create a URLContext for accessing to the resource indicated by
 
 /**
  * Create a URLContext for accessing to the resource indicated by