[Ffmpeg-devel] [PATCH] Move BeOS-specific code into os_support.c
Diego Biurrun
diego
Tue Nov 14 11:38:36 CET 2006
Here is a patch to slightly clean up BeOS handling in libavformat.
Should be OK (TM), even though untested (no BeOS here). Will commit
tomorrow unless there are objections.
Diego
-------------- next part --------------
Index: libavformat/os_support.c
===================================================================
--- libavformat/os_support.c (revision 7052)
+++ libavformat/os_support.c (working copy)
@@ -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 <time.h>
+#include <stdlib.h>
+#include <strings.h>
+#include "barpainet.h"
+
/**
* gets the current time in micro seconds.
*/
@@ -65,3 +70,27 @@
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 */
Index: libavformat/Makefile
===================================================================
--- libavformat/Makefile (revision 7052)
+++ libavformat/Makefile (working copy)
@@ -167,11 +167,8 @@
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
ifeq ($(CONFIG_LIBNUT),yes)
OBJS-$(CONFIG_NUT_DEMUXER) += libnut.o riff.o
Index: libavformat/barpainet.c
===================================================================
--- libavformat/barpainet.c (revision 7052)
+++ libavformat/barpainet.c (working copy)
@@ -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;
-}
More information about the ffmpeg-devel
mailing list