diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-15 12:54:12 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-15 12:54:12 +0000 |
| commit | 88e44314ea0bbd7b8cec7fe8a3fcab68751ff3ba (patch) | |
| tree | b25cf235e21f3f7cbcf89886dfb84fcca9e7e806 /libavformat | |
| parent | 8ef30ac1f309fcf87c4df92e71c890f48cc199bb (diff) | |
add FF_API_URL_SPLIT define to disable the deprecated ff_url_split() function
Originally committed as revision 25482 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 3 | ||||
| -rw-r--r-- | libavformat/internal.h | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d121b59e37..655488ca95 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -60,6 +60,9 @@ #ifndef FF_API_UDP_GET_FILE #define FF_API_UDP_GET_FILE (LIBAVFORMAT_VERSION_MAJOR < 53) #endif +#ifndef FF_API_URL_SPLIT +#define FF_API_URL_SPLIT (LIBAVFORMAT_VERSION_MAJOR < 53) +#endif /** * I return the LIBAVFORMAT_VERSION_INT constant. You got diff --git a/libavformat/internal.h b/libavformat/internal.h index decc26fdd6..d723f0958f 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -101,7 +101,7 @@ int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt, const char *filename, void *logctx, unsigned int offset, unsigned int max_probe_size); -#if LIBAVFORMAT_VERSION_MAJOR < 53 +#if FF_API_URL_SPLIT /** * @deprecated use av_url_split() instead */ diff --git a/libavformat/utils.c b/libavformat/utils.c index 4060ca9ed8..ebcb7d7e45 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3526,7 +3526,7 @@ void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload) pkt_dump_internal(avcl, NULL, level, pkt, dump_payload); } -#if LIBAVFORMAT_VERSION_MAJOR < 53 +#if FF_API_URL_SPLIT attribute_deprecated void ff_url_split(char *proto, int proto_size, char *authorization, int authorization_size, |