Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / url.h

diff --git a/libavformat/url.h b/libavformat/url.h
index dbcf470d69cf3e37da8efd2b5155e1fc76e44a3f..b459a59e0306015cf6dc46fb4b3f5297804c727f 100644 (file)
--- a/libavformat/url.h
+++ b/libavformat/url.h
@@ -31,8 +31,8 @@
 #include "libavutil/dict.h"
 #include "libavutil/log.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 */
+#define URL_PROTOCOL_FLAG_NETWORK       2 /*< The protocol uses network */
 
 extern int (*url_interrupt_cb)(void);
 
@@ -73,7 +73,6 @@ typedef struct URLProtocol {
     int flags;
     int (*url_check)(URLContext *h, int mask);
 } URLProtocol;
-#endif
 
 /**
  * Create a URLContext for accessing to the resource indicated by