From 54eb77c05e6a03815316908a64fa31b8c5353929 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 14 Nov 2006 21:31:19 +0000 Subject: [PATCH] Move BeOS-specific code into os_support.c. Originally committed as revision 7071 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/Makefile | 3 --- libavformat/barpainet.c | 44 -------------------------------------------- libavformat/os_support.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 47 deletions(-) delete mode 100644 libavformat/barpainet.c diff --git a/libavformat/Makefile b/libavformat/Makefile index cbfb9002d8..c044caedbd 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -167,9 +167,6 @@ ifeq ($(CONFIG_PROTOCOLS),yes) OBJS+= file.o ifeq ($(CONFIG_NETWORK),yes) OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o -ifneq ($(HAVE_INET_ATON),yes) -OBJS+= barpainet.o -endif endif endif diff --git a/libavformat/barpainet.c b/libavformat/barpainet.c deleted file mode 100644 index c4983222b1..0000000000 --- a/libavformat/barpainet.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * copyright (c) 2002 Francois Revol - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include "barpainet.h" - -int inet_aton (const char * str, struct in_addr * add) { - const char * pch = str; - unsigned int add1 = 0, add2 = 0, add3 = 0, add4 = 0; - - add1 = atoi(pch); - pch = strpbrk(pch,"."); - if (pch == 0 || ++pch == 0) goto done; - add2 = atoi(pch); - pch = strpbrk(pch,"."); - if (pch == 0 || ++pch == 0) goto done; - add3 = atoi(pch); - pch = strpbrk(pch,"."); - if (pch == 0 || ++pch == 0) goto done; - add4 = atoi(pch); - -done: - add->s_addr=(add4<<24)+(add3<<16)+(add2<<8)+add1; - - return 1; -} diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 079a8a9fc1..fc043c1411 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -1,6 +1,7 @@ /* * Various utilities for ffmpeg system * Copyright (c) 2000, 2001, 2002 Fabrice Bellard + * copyright (c) 2002 Francois Revol * * This file is part of FFmpeg. * @@ -35,6 +36,10 @@ #endif #include +#include +#include +#include "barpainet.h" + /** * gets the current time in micro seconds. */ @@ -65,3 +70,27 @@ struct tm *localtime_r(const time_t *t, struct tm *tp) return tp; } #endif /* !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) */ + +#if !defined(HAVE_INET_ATON) +int inet_aton (const char * str, struct in_addr * add) +{ + const char * pch = str; + unsigned int add1 = 0, add2 = 0, add3 = 0, add4 = 0; + + add1 = atoi(pch); + pch = strpbrk(pch,"."); + if (pch == 0 || ++pch == 0) goto done; + add2 = atoi(pch); + pch = strpbrk(pch,"."); + if (pch == 0 || ++pch == 0) goto done; + add3 = atoi(pch); + pch = strpbrk(pch,"."); + if (pch == 0 || ++pch == 0) goto done; + add4 = atoi(pch); + +done: + add->s_addr=(add4<<24)+(add3<<16)+(add2<<8)+add1; + + return 1; +} +#endif /* !defined HAVE_INET_ATON */ -- 2.11.0