Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / network.c

diff --git a/libavformat/network.c b/libavformat/network.c
index 727ca5024f6f1cf8707d9aae4bfe4f4cab2102f4..0e79cae7bff29cc07d4b0afd66524e831587c196 100644 (file)
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -21,6 +21,7 @@
 #include "libavutil/avutil.h"
 #include "network.h"
 #include "libavcodec/internal.h"
+#include "libavutil/mem.h"
 
 #define THREADS (HAVE_PTHREADS || (defined(WIN32) && !defined(__MINGW32CE__)))
 
@@ -165,6 +166,14 @@ int ff_neterrno(void)
         return AVERROR(EAGAIN);
     case WSAEINTR:
         return AVERROR(EINTR);
+    case WSAEPROTONOSUPPORT:
+        return AVERROR(EPROTONOSUPPORT);
+    case WSAETIMEDOUT:
+        return AVERROR(ETIMEDOUT);
+    case WSAECONNREFUSED:
+        return AVERROR(ECONNREFUSED);
+    case WSAEINPROGRESS:
+        return AVERROR(EINPROGRESS);
     }
     return -err;
 }