summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-03-08 09:03:25 +0000
committerMartin Storsjö <martin@martin.st>2010-03-08 09:03:25 +0000
commitc5c6e67c28e0e30b681cff55e8d85bb963d8640e (patch)
treed76a2596d799248e9e6cc7f3157b2f662424724b /libavformat/avformat.h
parentda5bcafe3b728f255ad068fc406622515b435082 (diff)
Rename url_split to ff_url_split
Since this function isn't in the public API, it should have an ff_ prefix. Originally committed as revision 22321 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4d684dad50..0b7936af07 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1343,7 +1343,7 @@ struct in_addr;
/* Deprecated, use getaddrinfo instead. */
attribute_deprecated int resolve_host(struct in_addr *sin_addr, const char *hostname);
-void url_split(char *proto, int proto_size,
+void ff_url_split(char *proto, int proto_size,
char *authorization, int authorization_size,
char *hostname, int hostname_size,
int *port_ptr,
@@ -1352,12 +1352,12 @@ void url_split(char *proto, int proto_size,
/**
* Assembles a URL string from components. This is the reverse operation
- * of url_split.
+ * of ff_url_split.
*
* Note, this requires networking to be initialized, so the caller must
* ensure ff_network_init has been called.
*
- * @see url_split
+ * @see ff_url_split
*
* @param str the buffer to fill with the url
* @param size the size of the str buffer