diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-19 21:21:32 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-19 21:21:32 +0000 |
| commit | 838b27b42c1838857e6b2ad47b4a932717108c10 (patch) | |
| tree | 6b9b9ad2845776ae5de8639e00efceba66cbc8b0 /libavformat | |
| parent | b2125520e7a3772724c25de7771d3cc987698fd3 (diff) | |
add FF_API_REGISTER_PROTOCOL define to disable the deprecated
register_protocol() function
Originally committed as revision 24840 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 3 | ||||
| -rw-r--r-- | libavformat/avio.c | 2 | ||||
| -rw-r--r-- | libavformat/avio.h | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f49c842978..d61e293669 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -48,6 +48,9 @@ #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 /** * I return the LIBAVFORMAT_VERSION_INT constant. You got diff --git a/libavformat/avio.c b/libavformat/avio.c index f19cb29d95..9d50b48460 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -71,7 +71,7 @@ int av_register_protocol2(URLProtocol *protocol, int size) return 0; } -#if LIBAVFORMAT_VERSION_MAJOR < 53 +#if FF_API_REGISTER_PROTOCOL /* The layout of URLProtocol as of when major was bumped to 52 */ struct URLProtocol_compat { const char *name; diff --git a/libavformat/avio.h b/libavformat/avio.h index 2b7a9c50a1..8c5f94acb8 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -256,7 +256,7 @@ typedef struct URLProtocol { const AVClass *priv_data_class; } URLProtocol; -#if LIBAVFORMAT_VERSION_MAJOR < 53 +#if FF_API_REGISTER_PROTOCOL extern URLProtocol *first_protocol; #endif @@ -269,7 +269,7 @@ extern URLInterruptCB *url_interrupt_cb; */ URLProtocol *av_protocol_next(URLProtocol *p); -#if LIBAVFORMAT_VERSION_MAJOR < 53 +#if FF_API_REGISTER_PROTOCOL /** * @deprecated Use av_register_protocol() instead. */ |