Commit 65c40e4e authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

Rename register_protocol() to av_register_protocol() and deprecate

register_protocol().

Originally committed as revision 17322 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 54b4ea57
......@@ -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, \
......
......@@ -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)
{
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment