[Ffmpeg-cvslog] r7817 - in trunk/libavformat: http.c network.h rtp.c rtp_h264.c rtpproto.c rtsp.c tcp.c udp.c

[mru]

Author: mru
Date: Sun Feb  4 18:05:44 2007
New Revision: 7817

Added:
   trunk/libavformat/network.h
Modified:
   trunk/libavformat/http.c
   trunk/libavformat/rtp.c
   trunk/libavformat/rtp_h264.c
   trunk/libavformat/rtpproto.c
   trunk/libavformat/rtsp.c
   trunk/libavformat/tcp.c
   trunk/libavformat/udp.c

Log:
move networking #includes into separate file
patch by Ramiro Polla angustia =a= arrozcru =d= no-ip =d= org


Modified: trunk/libavformat/http.c
==============================================================================
--- trunk/libavformat/http.c	(original)
+++ trunk/libavformat/http.c	Sun Feb  4 18:05:44 2007
@@ -20,11 +20,7 @@
  */
 #include "avformat.h"
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#include "network.h"
 
 #include "base64.h"
 

Added: trunk/libavformat/network.h
==============================================================================
--- (empty file)
+++ trunk/libavformat/network.h	Sun Feb  4 18:05:44 2007
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2007 The FFmpeg Project.
+ *
+ * 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
+ */
+
+#ifndef NETWORK_H
+#define NETWORK_H
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#endif

Modified: trunk/libavformat/rtp.c
==============================================================================
--- trunk/libavformat/rtp.c	(original)
+++ trunk/libavformat/rtp.c	Sun Feb  4 18:05:44 2007
@@ -23,11 +23,7 @@
 #include "bitstream.h"
 
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#include "network.h"
 
 #include "rtp_internal.h"
 #include "rtp_h264.h"

Modified: trunk/libavformat/rtp_h264.c
==============================================================================
--- trunk/libavformat/rtp_h264.c	(original)
+++ trunk/libavformat/rtp_h264.c	Sun Feb  4 18:05:44 2007
@@ -41,12 +41,8 @@
 #include "bitstream.h"
 
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
+#include "network.h"
 #include <assert.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 
 #include "rtp_internal.h"
 #include "rtp_h264.h"

Modified: trunk/libavformat/rtpproto.c
==============================================================================
--- trunk/libavformat/rtpproto.c	(original)
+++ trunk/libavformat/rtpproto.c	Sun Feb  4 18:05:44 2007
@@ -22,11 +22,7 @@
 
 #include <unistd.h>
 #include <stdarg.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#include "network.h"
 #include <fcntl.h>
 
 #define RTP_TX_BUF_SIZE  (64 * 1024)

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	(original)
+++ trunk/libavformat/rtsp.c	Sun Feb  4 18:05:44 2007
@@ -21,10 +21,7 @@
 #include "avformat.h"
 
 #include <unistd.h> /* for select() prototype */
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
+#include "network.h"
 
 #include "rtp_internal.h"
 

Modified: trunk/libavformat/tcp.c
==============================================================================
--- trunk/libavformat/tcp.c	(original)
+++ trunk/libavformat/tcp.c	Sun Feb  4 18:05:44 2007
@@ -20,11 +20,7 @@
  */
 #include "avformat.h"
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#include "network.h"
 #include <sys/time.h>
 #include <fcntl.h>
 

Modified: trunk/libavformat/udp.c
==============================================================================
--- trunk/libavformat/udp.c	(original)
+++ trunk/libavformat/udp.c	Sun Feb  4 18:05:44 2007
@@ -20,11 +20,7 @@
  */
 #include "avformat.h"
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#include "network.h"
 
 #ifndef IPV6_ADD_MEMBERSHIP
 #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP