Include os_support.h only when needed

Originally committed as revision 11073 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 5061b21..900122c 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -890,8 +890,6 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
 
 #ifdef HAVE_AV_CONFIG_H
 
-#include "os_support.h"
-
 void __dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem);
 
 #ifdef __GNUC__

diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 13f82f7..8bde1b8 100644 (file)
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -23,6 +23,7 @@
 #include "avformat.h"
 #include <unistd.h>
 #include <fcntl.h>
+#include "os_support.h"
 
 #ifndef HAVE_SYS_POLL_H
 #ifdef HAVE_WINSOCK2_H

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index 1b9b4f8..bea0fb9 100644 (file)
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -21,6 +21,7 @@
 #include "avformat.h"
 #include <unistd.h>
 #include "network.h"
+#include "os_support.h"
 #include <sys/time.h>
 
 typedef struct TCPContext {

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 9b1e112..d5a48be 100644 (file)
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -21,6 +21,7 @@
 #include "avformat.h"
 #include <unistd.h>
 #include "network.h"
+#include "os_support.h"
 
 #ifndef IPV6_ADD_MEMBERSHIP
 #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP