[FFmpeg-devel] [PATCH] Define ETIMEDOUT in fifo_muxer.c for MinGW/Windows fate build.

Gregory J. Wolfe gregory.wolfe at kodakalaris.com
Thu Dec 1 00:02:17 EET 2016


Fate failed to build in the MinGW/Windows environment because
macro ETIMEDOUT was undefined.  When this condition is detected,
the code now defines this symbol the same way it's done in
libavformat/network.h.

Signed-off-by: Gregory J. Wolfe <gregory.wolfe at kodakalaris.com>
---
 libavformat/tests/fifo_muxer.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libavformat/tests/fifo_muxer.c b/libavformat/tests/fifo_muxer.c
index 9659198..97f798f 100644
--- a/libavformat/tests/fifo_muxer.c
+++ b/libavformat/tests/fifo_muxer.c
@@ -25,6 +25,18 @@
 #include "libavutil/avassert.h"
 #include "libavformat/avformat.h"
 #include "libavformat/url.h"
+#ifndef ETIMEDOUT
+#if HAVE_WINSOCK2_H
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#define ETIMEDOUT       WSAETIMEDOUT
+#else /* HAVE_WINSOCK2_H */
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#endif /* HAVE_WINSOCK2_H */
+#endif /* ifndef ETIMEDOUT */
 
 #define MAX_TST_PACKETS 128
 #define SLEEPTIME_50_MS 50000
-- 
2.5.1.windows.1



More information about the ffmpeg-devel mailing list