har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move BeOS-specific code into os_support.c.

Browse Source 
Originally committed as revision 7071 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-11-14 21:31:19 +00:00
parent 9bb328d397
commit 54eb77c05e
3 changed files with 29 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/Makefile
View File

@ -167,9 +167,6 @@ ifeq ($(CONFIG_PROTOCOLS),yes)
OBJS+= file.o OBJS+= file.o
ifeq ($(CONFIG_NETWORK),yes) ifeq ($(CONFIG_NETWORK),yes)
OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o 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
endif endif

44
libavformat/barpainet.c
View File

@ -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 <stdlib.h>
#include <strings.h>
#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;
}

29
libavformat/os_support.c
View File

@ -1,6 +1,7 @@
/* /*
* Various utilities for ffmpeg system * Various utilities for ffmpeg system
* Copyright (c) 2000, 2001, 2002 Fabrice Bellard * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
* copyright (c) 2002 Francois Revol
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
@ -35,6 +36,10 @@
#endif #endif
#include <time.h> #include <time.h>
#include <stdlib.h>
#include <strings.h>
#include "barpainet.h"
/** /**
* gets the current time in micro seconds. * gets the current time in micro seconds.
*/ */
@ -65,3 +70,27 @@ struct tm *localtime_r(const time_t *t, struct tm *tp)
return tp; return tp;
} }
#endif /* !defined(CONFIG_WINCE) && !defined(HAVE_LOCALTIME_R) */ #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 */