[FFmpeg-cvslog] r25482 - in trunk/libavformat: avformat.h internal.h utils.c

[aurel]

Author: aurel
Date: Fri Oct 15 14:54:12 2010
New Revision: 25482

Log:
add FF_API_URL_SPLIT define to disable the deprecated ff_url_split() function

Modified:
   trunk/libavformat/avformat.h
   trunk/libavformat/internal.h
   trunk/libavformat/utils.c

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	Fri Oct 15 14:49:48 2010	(r25481)
+++ trunk/libavformat/avformat.h	Fri Oct 15 14:54:12 2010	(r25482)
@@ -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

Modified: trunk/libavformat/internal.h
==============================================================================
--- trunk/libavformat/internal.h	Fri Oct 15 14:49:48 2010	(r25481)
+++ trunk/libavformat/internal.h	Fri Oct 15 14:54:12 2010	(r25482)
@@ -101,7 +101,7 @@ int ff_probe_input_buffer(ByteIOContext 
                           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
  */

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Fri Oct 15 14:49:48 2010	(r25481)
+++ trunk/libavformat/utils.c	Fri Oct 15 14:54:12 2010	(r25482)
@@ -3526,7 +3526,7 @@ void av_pkt_dump_log(void *avcl, int lev
     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,