diff internal.h @ 6182:4fc5e0e4e1cd libavformat

Make ff_url_split() public ff_url_split() is retained as an alias, as it was used by ffserver, to avoid breaking ABI compatibility with it.
author mru
date Sun, 27 Jun 2010 14:16:46 +0000
parents 0e737c9247fd
children 83978c1b9739
line wrap: on
line diff
--- a/internal.h	Sun Jun 27 09:07:35 2010 +0000
+++ b/internal.h	Sun Jun 27 14:16:46 2010 +0000
@@ -89,27 +89,9 @@
                           const char *filename, void *logctx,
                           unsigned int offset, unsigned int max_probe_size);
 
+#if LIBAVFORMAT_VERSION_MAJOR < 53
 /**
- * Splits a URL string into components. To reassemble components back into
- * a URL, use ff_url_join instead of using snprintf directly.
- *
- * The pointers to buffers for storing individual components may be null,
- * in order to ignore that component. Buffers for components not found are
- * set to empty strings. If the port isn't found, it is set to a negative
- * value.
- *
- * @see ff_url_join
- *
- * @param proto the buffer for the protocol
- * @param proto_size the size of the proto buffer
- * @param authorization the buffer for the authorization
- * @param authorization_size the size of the authorization buffer
- * @param hostname the buffer for the host name
- * @param hostname_size the size of the hostname buffer
- * @param port_ptr a pointer to store the port number in
- * @param path the buffer for the path
- * @param path_size the size of the path buffer
- * @param url the URL to split
+ * @deprecated use av_url_split() instead
  */
 void ff_url_split(char *proto, int proto_size,
                   char *authorization, int authorization_size,
@@ -117,15 +99,16 @@
                   int *port_ptr,
                   char *path, int path_size,
                   const char *url);
+#endif
 
 /**
  * Assembles a URL string from components. This is the reverse operation
- * of ff_url_split.
+ * of av_url_split.
  *
  * Note, this requires networking to be initialized, so the caller must
  * ensure ff_network_init has been called.
  *
- * @see ff_url_split
+ * @see av_url_split
  *
  * @param str the buffer to fill with the url
  * @param size the size of the str buffer