From 42572ef53f5199160ecc3e18bb549caece8b26dc Mon Sep 17 00:00:00 2001
From: Ramiro Polla <ramiro@lisha.ufsc.br>
Date: Sun, 4 Feb 2007 17:05:44 +0000
Subject: [PATCH] move networking #includes into separate file patch by Ramiro
 Polla angustia =a= arrozcru =d= no-ip =d= org

Originally committed as revision 7817 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/http.c     |  6 +-----
 libavformat/network.h  | 30 ++++++++++++++++++++++++++++++
 libavformat/rtp.c      |  6 +-----
 libavformat/rtp_h264.c |  6 +-----
 libavformat/rtpproto.c |  6 +-----
 libavformat/rtsp.c     |  5 +----
 libavformat/tcp.c      |  6 +-----
 libavformat/udp.c      |  6 +-----
 8 files changed, 37 insertions(+), 34 deletions(-)
 create mode 100644 libavformat/network.h

diff --git a/libavformat/http.c b/libavformat/http.c
index 63cdb34530..2d8098838f 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -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"
 
diff --git a/libavformat/network.h b/libavformat/network.h
new file mode 100644
index 0000000000..b67b9b1364
--- /dev/null
+++ b/libavformat/network.h
@@ -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
diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index 359b1f2c9e..919a4b59e0 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -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"
diff --git a/libavformat/rtp_h264.c b/libavformat/rtp_h264.c
index 1d5c766595..2d31822788 100644
--- a/libavformat/rtp_h264.c
+++ b/libavformat/rtp_h264.c
@@ -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"
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index 14850c48c1..6804510b1d 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -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)
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 2bc6bb249a..2871f21a9f 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -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"
 
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index 769282182c..be8a4bb0bb 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -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>
 
diff --git a/libavformat/udp.c b/libavformat/udp.c
index 0d165d2f1c..9021197647 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -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