diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-01-06 18:59:46 +0000 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-01-06 18:59:46 +0000 |
| commit | c693af1951a0074a29ce39b69736ff0cf33b41d2 (patch) | |
| tree | fd3c0f5eb5e206e45681845cc8c10e5dc33297f2 /libavformat/os_support.c | |
| parent | 7c6125cbcc6e805711feff9cbf35329adcb6e313 (diff) | |
| download | ffmpeg-c693af1951a0074a29ce39b69736ff0cf33b41d2.tar.gz | |
libavformat/network: fix function duplication
Since the function used to be exposed for ffserver's sake, it was renamed
to the same name as a system's aton function which caused a collision.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavformat/os_support.c')
| -rw-r--r-- | libavformat/os_support.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 6bdfc04097..099d7b501f 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -60,11 +60,6 @@ static int inet_aton(const char *str, struct in_addr *add) return 1; } -#else -static int inet_aton(const char *str, struct in_addr *add) -{ - return inet_aton(str, add); -} #endif /* !HAVE_INET_ATON */ #if !HAVE_GETADDRINFO |