[FFmpeg-cvslog] libavformat/network: fix function duplication

Rostislav Pehlivanov git at videolan.org
Sat Jan 6 21:01:18 EET 2018


ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker at gmail.com> | Sat Jan  6 18:59:46 2018 +0000| [c693af1951a0074a29ce39b69736ff0cf33b41d2] | committer: Rostislav Pehlivanov

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c693af1951a0074a29ce39b69736ff0cf33b41d2
---

 libavformat/os_support.c | 5 -----
 1 file changed, 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



More information about the ffmpeg-cvslog mailing list