[FFmpeg-devel] [PATCH 3/6] libavformat: unexpose the ff_inet_aton function

[Rostislav Pehlivanov]

Used only by ffserver.

Signed-off-by: Rostislav Pehlivanov <atomnu...@gmail.com>
---
 libavformat/libavformat.v | 1 -
 libavformat/network.h     | 2 --
 libavformat/os_support.c  | 6 +++---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v
index c961cd8f19..4edf52f45e 100644
--- 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 f83c796a95..5ab858f08d 100644
--- a/libavformat/network.h
+++ b/libavformat/network.h
@@ -95,8 +95,6 @@ int ff_network_wait_fd(int fd, int write);
  */
 int ff_network_wait_fd_timeout(int fd, int write, 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 86d0b8f306..dc3bf65f34 100644
--- 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);
 }
@@ -92,7 +92,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;
-- 
2.15.0.rc1.287.g2b38de12cc

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel