diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-04 20:35:04 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-07 18:11:24 +0200 |
| commit | 8e76a19b63a3fa322a64a7d27bd6e642c7fe7f85 (patch) | |
| tree | 90c4c12b1ec0271cc9cb08e339859443e0f37e45 /libavformat | |
| parent | 80c6e238b0f42a0b07fbc195564a50032b3608ba (diff) | |
avio: make av_register_protocol2 internal.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/allformats.c | 3 | ||||
| -rw-r--r-- | libavformat/avio.c | 10 | ||||
| -rw-r--r-- | libavformat/avio.h | 4 | ||||
| -rw-r--r-- | libavformat/url.h | 7 |
4 files changed, 19 insertions, 5 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index e80d4b0175..9398d34be3 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -21,6 +21,7 @@ #include "avformat.h" #include "rtp.h" #include "rdt.h" +#include "url.h" #define REGISTER_MUXER(X,x) { \ extern AVOutputFormat ff_##x##_muxer; \ @@ -34,7 +35,7 @@ #define REGISTER_PROTOCOL(X,x) { \ extern URLProtocol ff_##x##_protocol; \ - if(CONFIG_##X##_PROTOCOL) av_register_protocol2(&ff_##x##_protocol, sizeof(ff_##x##_protocol)); } + if(CONFIG_##X##_PROTOCOL) ffurl_register_protocol(&ff_##x##_protocol, sizeof(ff_##x##_protocol)); } void av_register_all(void) { diff --git a/libavformat/avio.c b/libavformat/avio.c index bacf9f35cd..1d40da67ee 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -57,7 +57,7 @@ URLProtocol *av_protocol_next(URLProtocol *p) else return first_protocol; } -int av_register_protocol2(URLProtocol *protocol, int size) +int ffurl_register_protocol(URLProtocol *protocol, int size) { URLProtocol **p; if (size < sizeof(URLProtocol)) { @@ -86,12 +86,12 @@ struct URLProtocol_compat { int av_register_protocol(URLProtocol *protocol) { - return av_register_protocol2(protocol, sizeof(struct URLProtocol_compat)); + return ffurl_register_protocol(protocol, sizeof(struct URLProtocol_compat)); } int register_protocol(URLProtocol *protocol) { - return av_register_protocol2(protocol, sizeof(struct URLProtocol_compat)); + return ffurl_register_protocol(protocol, sizeof(struct URLProtocol_compat)); } #endif @@ -220,6 +220,10 @@ void url_set_interrupt_cb(URLInterruptCB *interrupt_cb) { avio_set_interrupt_cb(interrupt_cb); } +int av_register_protocol2(URLProtocol *protocol, int size) +{ + return ffurl_register_protocol(protocol, size); +} #endif #define URL_SCHEME_CHARS \ diff --git a/libavformat/avio.h b/libavformat/avio.h index 3a4b64e44d..41f51aaed4 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -184,12 +184,14 @@ attribute_deprecated int register_protocol(URLProtocol *protocol); attribute_deprecated int av_register_protocol(URLProtocol *protocol); #endif +#if FF_API_OLD_AVIO /** * Register the URLProtocol protocol. * * @param size the size of the URLProtocol struct referenced */ -int av_register_protocol2(URLProtocol *protocol, int size); +attribute_deprecated int av_register_protocol2(URLProtocol *protocol, int size); +#endif #define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */ diff --git a/libavformat/url.h b/libavformat/url.h index 72c19b62ad..2e1a3f3a72 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -131,4 +131,11 @@ int64_t ffurl_size(URLContext *h); */ int ffurl_get_file_handle(URLContext *h); +/** + * Register the URLProtocol protocol. + * + * @param size the size of the URLProtocol struct referenced + */ +int ffurl_register_protocol(URLProtocol *protocol, int size); + #endif //AVFORMAT_URL_H |