diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 12:36:18 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 18:28:38 +0200 |
| commit | dcd4a7b62f16793c33fa459889e581286d6ccdd6 (patch) | |
| tree | 1eee7f72543ab0bf2268e844f621575cd03ed089 | |
| parent | 468644f6c185c23affcb36939192b03cd166797f (diff) | |
| download | ffmpeg-dcd4a7b62f16793c33fa459889e581286d6ccdd6.tar.gz | |
lavf: remove FF_API_REGISTER_PROTOCOL cruft
| -rw-r--r-- | libavformat/avio.c | 23 | ||||
| -rw-r--r-- | libavformat/avio.h | 16 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 42 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index cb923a726e..c1c2027d5d 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -84,29 +84,6 @@ int ffurl_register_protocol(URLProtocol *protocol, int size) return 0; } -#if FF_API_REGISTER_PROTOCOL -/* The layout of URLProtocol as of when major was bumped to 52 */ -struct URLProtocol_compat { - const char *name; - int (*url_open)(URLContext *h, const char *filename, int flags); - int (*url_read)(URLContext *h, unsigned char *buf, int size); - int (*url_write)(URLContext *h, unsigned char *buf, int size); - int64_t (*url_seek)(URLContext *h, int64_t pos, int whence); - int (*url_close)(URLContext *h); - struct URLProtocol *next; -}; - -int av_register_protocol(URLProtocol *protocol) -{ - return ffurl_register_protocol(protocol, sizeof(struct URLProtocol_compat)); -} - -int register_protocol(URLProtocol *protocol) -{ - return ffurl_register_protocol(protocol, sizeof(struct URLProtocol_compat)); -} -#endif - static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up, const char *filename, int flags) { diff --git a/libavformat/avio.h b/libavformat/avio.h index 213baaab72..82c2cece07 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -373,22 +373,6 @@ int avio_check(const char *url, int flags); */ void avio_set_interrupt_cb(int (*interrupt_cb)(void)); -#if FF_API_REGISTER_PROTOCOL -extern URLProtocol *first_protocol; -#endif - -#if FF_API_REGISTER_PROTOCOL -/** - * @deprecated Use av_register_protocol() instead. - */ -attribute_deprecated int register_protocol(URLProtocol *protocol); - -/** - * @deprecated Use av_register_protocol2() instead. - */ -attribute_deprecated int av_register_protocol(URLProtocol *protocol); -#endif - /** * Allocate and initialize an AVIOContext for buffered I/O. It must be later * freed with av_free(). diff --git a/libavformat/version.h b/libavformat/version.h index aecc9618d1..ef253599e4 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -47,9 +47,6 @@ #ifndef FF_API_URL_CLASS #define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53) #endif -#ifndef FF_API_REGISTER_PROTOCOL -#define FF_API_REGISTER_PROTOCOL (LIBAVFORMAT_VERSION_MAJOR < 53) -#endif #ifndef FF_API_GUESS_FORMAT #define FF_API_GUESS_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53) #endif |