diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-02-15 14:25:23 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-02-15 14:25:23 +0000 |
| commit | 65c40e4e3a4d736632820b1a8e80a5d0c4fb31de (patch) | |
| tree | 4e474cb8746e9ebc2864a06af7446d07138d0b62 | |
| parent | 54b4ea57fdffd147eafafda27d3b46692c3a5a79 (diff) | |
| download | ffmpeg-65c40e4e3a4d736632820b1a8e80a5d0c4fb31de.tar.gz | |
Rename register_protocol() to av_register_protocol() and deprecate
register_protocol().
Originally committed as revision 17322 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/avio.c | 9 | ||||
| -rw-r--r-- | libavformat/avio.h | 9 |
3 files changed, 17 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 49f37e4e71..d107fafa8d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 28 +#define LIBAVFORMAT_VERSION_MINOR 29 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ diff --git a/libavformat/avio.c b/libavformat/avio.c index 5809c40479..011bc8808b 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -50,7 +50,7 @@ URLProtocol *av_protocol_next(URLProtocol *p) else return first_protocol; } -int register_protocol(URLProtocol *protocol) +int av_register_protocol(URLProtocol *protocol) { URLProtocol **p; p = &first_protocol; @@ -60,6 +60,13 @@ int register_protocol(URLProtocol *protocol) return 0; } +#if LIBAVFORMAT_VERSION_MAJOR < 53 +int register_protocol(URLProtocol *protocol) +{ + return av_register_protocol(protocol); +} +#endif + int url_open_protocol (URLContext **puc, struct URLProtocol *up, const char *filename, int flags) { diff --git a/libavformat/avio.h b/libavformat/avio.h index 3bb88b37c0..70538f3491 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -142,7 +142,14 @@ extern URLInterruptCB *url_interrupt_cb; URLProtocol *av_protocol_next(URLProtocol *p); -int register_protocol(URLProtocol *protocol); +#if LIBAVFORMAT_VERSION_MAJOR < 53 +/** + * @deprecated Use av_register_protocol() instead. + */ +attribute_deprecated int register_protocol(URLProtocol *protocol); +#endif + +int av_register_protocol(URLProtocol *protocol); /** * Bytestream IO Context. |