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

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index d121b59e378468225071d3dd88e86502610283a8..655488ca956528945006a5c07b8ceed02461c524 100644 (file)
--- 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_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
 
 /**
  * I return the LIBAVFORMAT_VERSION_INT constant.  You got

diff --git a/libavformat/internal.h b/libavformat/internal.h
index decc26fdd63a6124ec9020b1a5e4624a564c2074..d723f0958fd5bd349defc4e0c93c061c2569a7cc 100644 (file)
--- 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);
 
                           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
  */
 /**
  * @deprecated use av_url_split() instead
  */

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 4060ca9ed848942347f4144eb36cab36802677cb..ebcb7d7e4522baa824fd96523ca67309f1fe95a0 100644 (file)
--- 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);
 }
 
     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,
 attribute_deprecated
 void ff_url_split(char *proto, int proto_size,
                   char *authorization, int authorization_size,