libavformat: unexpose the ff_inet_aton function

Used only by ffserver.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v
index 291a38f8e771452778fed45ba9c5e5c5df78ac58..e838f2918adf44c39b7acbe1329af1524514da50 100644 (file)
--- a/libavformat/libavformat.v
+++ b/libavformat/libavformat.v
@@ -2,7 +2,6 @@ LIBAVFORMAT_MAJOR {
     global:
         av*;
         #FIXME those are for ffserver
-        ff_inet_aton;
         ff_socket_nonblock;
         ff_rtsp_parse_line;
         ff_rtp_get_local_rtp_port;

diff --git a/libavformat/network.h b/libavformat/network.h
index a66311554186440ffe70222ae0cbcc7ce28a2e5a..3c0f8732799fe4809889981fa8a9a8c1d0e9de4b 100644 (file)
--- a/libavformat/network.h
+++ b/libavformat/network.h
@@ -105,8 +105,6 @@ int ff_network_wait_fd_timeout(int fd, int write, int64_t timeout, AVIOInterrupt
  */
 int ff_network_sleep_interruptible(int64_t timeout, AVIOInterruptCB *int_cb);
 
-int ff_inet_aton (const char * str, struct in_addr * add);
-
 #if !HAVE_STRUCT_SOCKADDR_STORAGE
 struct sockaddr_storage {
 #if HAVE_STRUCT_SOCKADDR_SA_LEN

diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 47445854c61b009b5787cb7e9cca7c8b7e5a2b8d..6bdfc0409784a6b883719f015b8dd207520a493f 100644 (file)
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -46,7 +46,7 @@
 #if !HAVE_INET_ATON
 #include <stdlib.h>
 
-int ff_inet_aton(const char *str, struct in_addr *add)
+static int inet_aton(const char *str, struct in_addr *add)
 {
     unsigned int add1 = 0, add2 = 0, add3 = 0, add4 = 0;
 
@@ -61,7 +61,7 @@ int ff_inet_aton(const char *str, struct in_addr *add)
     return 1;
 }
 #else
-int ff_inet_aton(const char *str, struct in_addr *add)
+static int inet_aton(const char *str, struct in_addr *add)
 {
     return inet_aton(str, add);
 }
@@ -82,7 +82,7 @@ int ff_getaddrinfo(const char *node, const char *service,
     sin->sin_family = AF_INET;
 
     if (node) {
-        if (!ff_inet_aton(node, &sin->sin_addr)) {
+        if (!inet_aton(node, &sin->sin_addr)) {
             if (hints && (hints->ai_flags & AI_NUMERICHOST)) {
                 av_free(sin);
                 return EAI_FAIL;