MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavformat: unexpose the ff_inet_aton function

Browse Source 
Used only by ffserver.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov 2017-10-21 19:40:50 +01:00
parent c17f476144
commit 9396ed0f29
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/libavformat.v
View File

@ -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;

2
libavformat/network.h
View File

@ -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

6
libavformat/os_support.c
View File

@ -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;