summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRostislav Pehlivanov <atomnuker@gmail.com>2017-10-21 19:40:50 +0100
committerRostislav Pehlivanov <atomnuker@gmail.com>2018-01-06 18:34:39 +0000
commit9396ed0f291509e62235e12cd064d5b13b2473c2 (patch)
tree4cc8e70b901f102d2662c6b0c55df9fb6ceaf5d1
parentc17f4761443b471f47fa8f0a5bcff078cdff9479 (diff)
downloadffmpeg-9396ed0f291509e62235e12cd064d5b13b2473c2.tar.gz
libavformat: unexpose the ff_inet_aton function
Used only by ffserver. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
-rw-r--r--libavformat/libavformat.v1
-rw-r--r--libavformat/network.h2
-rw-r--r--libavformat/os_support.c6
3 files changed, 3 insertions, 6 deletions
diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v
index 291a38f8e7..e838f2918a 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 a663115541..3c0f873279 100644
--- 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 47445854c6..6bdfc04097 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);
}
@@ -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;