From: Anton Khirnov Date: Mon, 4 Apr 2011 17:55:07 +0000 (+0200) Subject: avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal X-Git-Tag: n0.7.1~66^2~76 X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/b84048479888739e0aa8d9e534c49a3ab0e02252 avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal --- 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