[FFmpeg-cvslog] r22534 - in trunk/libavformat: avformat.h gopher.c http.c internal.h rtmpproto.c rtpproto.c rtsp.c tcp.c udp.c

[aurel]

Author: aurel
Date: Mon Mar 15 00:59:48 2010
New Revision: 22534

Log:
move ff_url_split() and ff_url_join() declarations to internal.h
those functions are not part of the public API

Modified:
   trunk/libavformat/avformat.h
   trunk/libavformat/gopher.c
   trunk/libavformat/http.c
   trunk/libavformat/internal.h
   trunk/libavformat/rtmpproto.c
   trunk/libavformat/rtpproto.c
   trunk/libavformat/rtsp.c
   trunk/libavformat/tcp.c
   trunk/libavformat/udp.c

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	Mon Mar 15 00:52:45 2010	(r22533)
+++ trunk/libavformat/avformat.h	Mon Mar 15 00:59:48 2010	(r22534)
@@ -1340,59 +1340,6 @@ const char *small_strptime(const char *p
                            struct tm *dt);
 
 /**
- * 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
- */
-void ff_url_split(char *proto, int proto_size,
-                  char *authorization, int authorization_size,
-                  char *hostname, int hostname_size,
-                  int *port_ptr,
-                  char *path, int path_size,
-                  const char *url);
-
-/**
- * Assembles a URL string from components. This is the reverse operation
- * of ff_url_split.
- *
- * Note, this requires networking to be initialized, so the caller must
- * ensure ff_network_init has been called.
- *
- * @see ff_url_split
- *
- * @param str the buffer to fill with the url
- * @param size the size of the str buffer
- * @param proto the protocol identifier, if null, the separator
- *              after the identifier is left out, too
- * @param authorization an optional authorization string, may be null
- * @param hostname the host name string
- * @param port the port number, left out from the string if negative
- * @param fmt a generic format string for everything to add after the
- *            host/port, may be null
- * @return the number of characters written to the destination buffer
- */
-int ff_url_join(char *str, int size, const char *proto,
-                const char *authorization, const char *hostname,
-                int port, const char *fmt, ...);
-
-/**
  * Returns a positive value if the given filename has one of the given
  * extensions, 0 otherwise.
  *

Modified: trunk/libavformat/gopher.c
==============================================================================
--- trunk/libavformat/gopher.c	Mon Mar 15 00:52:45 2010	(r22533)
+++ trunk/libavformat/gopher.c	Mon Mar 15 00:59:48 2010	(r22534)
@@ -24,6 +24,7 @@
 
 #include "libavutil/avstring.h"
 #include "avformat.h"
+#include "internal.h"
 #include "network.h"
 
 typedef struct {

Modified: trunk/libavformat/http.c
==============================================================================
--- trunk/libavformat/http.c	Mon Mar 15 00:52:45 2010	(r22533)
+++ trunk/libavformat/http.c	Mon Mar 15 00:59:48 2010	(r22534)
@@ -24,6 +24,7 @@
 #include "avformat.h"
 #include <unistd.h>
 #include <strings.h>
+#include "internal.h"
 #include "network.h"
 #include "os_support.h"
 

Modified: trunk/libavformat/internal.h
==============================================================================
--- trunk/libavformat/internal.h	Mon Mar 15 00:52:45 2010	(r22533)
+++ trunk/libavformat/internal.h	Mon Mar 15 00:59:48 2010	(r22534)
@@ -59,4 +59,57 @@ int ff_probe_input_buffer(ByteIOContext 
                           const char *filename, void *logctx,
                           unsigned int offset, unsigned int max_probe_size);
 
+/**
+ * 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
+ */
+void ff_url_split(char *proto, int proto_size,
+                  char *authorization, int authorization_size,
+                  char *hostname, int hostname_size,
+                  int *port_ptr,
+                  char *path, int path_size,
+                  const char *url);
+
+/**
+ * Assembles a URL string from components. This is the reverse operation
+ * of ff_url_split.
+ *
+ * Note, this requires networking to be initialized, so the caller must
+ * ensure ff_network_init has been called.
+ *
+ * @see ff_url_split
+ *
+ * @param str the buffer to fill with the url
+ * @param size the size of the str buffer
+ * @param proto the protocol identifier, if null, the separator
+ *              after the identifier is left out, too
+ * @param authorization an optional authorization string, may be null
+ * @param hostname the host name string
+ * @param port the port number, left out from the string if negative
+ * @param fmt a generic format string for everything to add after the
+ *            host/port, may be null
+ * @return the number of characters written to the destination buffer
+ */
+int ff_url_join(char *str, int size, const char *proto,
+                const char *authorization, const char *hostname,
+                int port, const char *fmt, ...);
+
 #endif /* AVFORMAT_INTERNAL_H */

Modified: trunk/libavformat/rtmpproto.c
==============================================================================
--- trunk/libavformat/rtmpproto.c	Mon Mar 15 00:52:45 2010	(r22533)
+++ trunk/libavformat/rtmpproto.c	Mon Mar 15 00:59:48 2010	(r22534)
@@ -29,6 +29,7 @@
 #include "libavutil/lfg.h"
 #include "libavutil/sha.h"
 #include "avformat.h"
+#include "internal.h"
 
 #include "network.h"
 

Modified: trunk/libavformat/rtpproto.c
==============================================================================
--- trunk/libavformat/rtpproto.c	Mon Mar 15 00:52:45 2010	(r22533)
+++ trunk/libavformat/rtpproto.c	Mon Mar 15 00:59:48 2010	(r22534)
@@ -30,6 +30,7 @@
 
 #include <unistd.h>
 #include <stdarg.h>
+#include "internal.h"
 #include "network.h"
 #include "os_support.h"
 #include <fcntl.h>

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Mon Mar 15 00:52:45 2010	(r22533)
+++ trunk/libavformat/rtsp.c	Mon Mar 15 00:59:48 2010	(r22534)
@@ -29,6 +29,7 @@
 #include <sys/select.h>
 #endif
 #include <strings.h>
+#include "internal.h"
 #include "network.h"
 #include "os_support.h"
 #include "rtsp.h"

Modified: trunk/libavformat/tcp.c
==============================================================================
--- trunk/libavformat/tcp.c	Mon Mar 15 00:52:45 2010	(r22533)
+++ trunk/libavformat/tcp.c	Mon Mar 15 00:59:48 2010	(r22534)
@@ -20,6 +20,7 @@
  */
 #include "avformat.h"
 #include <unistd.h>
+#include "internal.h"
 #include "network.h"
 #include "os_support.h"
 #if HAVE_SYS_SELECT_H

Modified: trunk/libavformat/udp.c
==============================================================================
--- trunk/libavformat/udp.c	Mon Mar 15 00:52:45 2010	(r22533)
+++ trunk/libavformat/udp.c	Mon Mar 15 00:59:48 2010	(r22534)
@@ -27,6 +27,7 @@
 #define _BSD_SOURCE     /* Needed for using struct ip_mreq with recent glibc */
 #include "avformat.h"
 #include <unistd.h>
+#include "internal.h"
 #include "network.h"
 #include "os_support.h"
 #if HAVE_SYS_SELECT_H