summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-04-04 19:55:07 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-05 08:40:57 +0200
commitb84048479888739e0aa8d9e534c49a3ab0e02252 (patch)
treee67010fbf42ad7772f451fd0aee5cac106f6a21f /libavformat
parent1305d93c42946ef524c1cdc927a7e66eec510005 (diff)
avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avio.h2
-rw-r--r--libavformat/url.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 08453731df..5a535f7973 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 eea9678ddc..72c19b62ad 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