[SCM] libav/experimental: Group network-related code together
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:16:36 UTC 2013
The following commit has been merged in the experimental branch:
commit 591cf1170bd9a71c97776828963f299923aed1d7
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date: Sat Mar 8 17:43:10 2008 +0000
Group network-related code together
Originally committed as revision 12371 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 26141fe..ee095c7 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -27,10 +27,6 @@
* miscellaneous OS support macros and functions.
*/
-#ifndef HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
-
#ifdef __MINGW32__
__declspec(dllimport) void WINAPI Sleep(unsigned long dwMilliseconds);
// # include <windows.h>
@@ -56,6 +52,10 @@ __declspec(dllimport) void WINAPI Sleep(unsigned long dwMilliseconds);
# endif
#endif
+#ifndef HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
/* most of the time closing a socket is just closing an fd */
#ifndef HAVE_CLOSESOCKET
#define closesocket close
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list