[SCM] libav/experimental: Fix compilation of os_support.c for MinGW with --disable-network Patch by Tom Harper <d.thomas.harper <at> gmail.com>

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:10:19 UTC 2013


The following commit has been merged in the experimental branch:
commit 72d6b1bf1b92a2949f0a24fa7751a03cd75e7b6b
Author: Tom Harper <d.thomas.harper at gmail.com>
Date:   Sun Dec 9 14:39:01 2007 +0000

    Fix compilation of os_support.c for MinGW with --disable-network
    Patch by Tom Harper <d.thomas.harper <at> gmail.com>
    
    Originally committed as revision 11200 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 8bde1b8..983523b 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include "os_support.h"
 
+#ifdef CONFIG_NETWORK
 #ifndef HAVE_SYS_POLL_H
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
@@ -33,7 +34,6 @@
 #endif
 #endif
 
-#ifdef CONFIG_NETWORK
 #include "network.h"
 
 #if !defined(HAVE_INET_ATON)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list