[FFmpeg-cvslog] avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal

Anton Khirnov git at videolan.org
Wed Apr 6 03:04:07 CEST 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Apr  4 19:55:07 2011 +0200| [b84048479888739e0aa8d9e534c49a3ab0e02252] | committer: Anton Khirnov

avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b84048479888739e0aa8d9e534c49a3ab0e02252
---

 libavformat/avio.h |    2 +-
 libavformat/url.h  |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 0845373..5a535f7 100644
--- 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);
-#endif
 
 
 #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;
diff --git a/libavformat/url.h b/libavformat/url.h
index eea9678..72c19b6 100644
--- a/libavformat/url.h
+++ b/libavformat/url.h
@@ -26,6 +26,11 @@
 #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



More information about the ffmpeg-cvslog mailing list