Commit 9396ed0f authored by Rostislav Pehlivanov's avatar Rostislav Pehlivanov

libavformat: unexpose the ff_inet_aton function

Used only by ffserver.
Signed-off-by: 's avatarRostislav Pehlivanov <atomnuker@gmail.com>
parent c17f4761
...@@ -2,7 +2,6 @@ LIBAVFORMAT_MAJOR { ...@@ -2,7 +2,6 @@ LIBAVFORMAT_MAJOR {
global: global:
av*; av*;
#FIXME those are for ffserver #FIXME those are for ffserver
ff_inet_aton;
ff_socket_nonblock; ff_socket_nonblock;
ff_rtsp_parse_line; ff_rtsp_parse_line;
ff_rtp_get_local_rtp_port; ff_rtp_get_local_rtp_port;
......
...@@ -105,8 +105,6 @@ int ff_network_wait_fd_timeout(int fd, int write, int64_t timeout, AVIOInterrupt ...@@ -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_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 #if !HAVE_STRUCT_SOCKADDR_STORAGE
struct sockaddr_storage { struct sockaddr_storage {
#if HAVE_STRUCT_SOCKADDR_SA_LEN #if HAVE_STRUCT_SOCKADDR_SA_LEN
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#if !HAVE_INET_ATON #if !HAVE_INET_ATON
#include <stdlib.h> #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; 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) ...@@ -61,7 +61,7 @@ int ff_inet_aton(const char *str, struct in_addr *add)
return 1; return 1;
} }
#else #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); return inet_aton(str, add);
} }
...@@ -82,7 +82,7 @@ int ff_getaddrinfo(const char *node, const char *service, ...@@ -82,7 +82,7 @@ int ff_getaddrinfo(const char *node, const char *service,
sin->sin_family = AF_INET; sin->sin_family = AF_INET;
if (node) { if (node) {
if (!ff_inet_aton(node, &sin->sin_addr)) { if (!inet_aton(node, &sin->sin_addr)) {
if (hints && (hints->ai_flags & AI_NUMERICHOST)) { if (hints && (hints->ai_flags & AI_NUMERICHOST)) {
av_free(sin); av_free(sin);
return EAI_FAIL; return EAI_FAIL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment