Mercurial > libavformat.hg

changeset 5954:1c93ef22cea6 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compile error on mingw where ETIMEDOUT is missing (because it's a WSA error). This patch also changes FF_NETERROR() to be an AVERROR(), i.e. it is always negative, whereas it was previously positive.
author rbultje
date Thu, 15 Apr 2010 18:27:27 +0000
parents c3ebc8d7af38
children 780410aa35b7
files network.h rtsp.c
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/network.h	Thu Apr 15 13:30:12 2010 +0000
+++ b/network.h	Thu Apr 15 18:27:27 2010 +0000
@@ -27,8 +27,8 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
-#define ff_neterrno() WSAGetLastError()
-#define FF_NETERROR(err) WSA##err
+#define ff_neterrno() (-WSAGetLastError())
+#define FF_NETERROR(err) (-WSA##err)
 #define WSAEAGAIN WSAEWOULDBLOCK
 #else
 #include <sys/types.h>
@@ -36,8 +36,8 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-#define ff_neterrno() errno
-#define FF_NETERROR(err) err
+#define ff_neterrno() AVERROR(errno)
+#define FF_NETERROR(err) AVERROR(err)
 #endif
 
 #if HAVE_ARPA_INET_H
--- a/rtsp.c	Thu Apr 15 13:30:12 2010 +0000
+++ b/rtsp.c	Thu Apr 15 18:27:27 2010 +0000
@@ -1692,7 +1692,7 @@
             }
 #endif
         } else if (n == 0 && ++timeout_cnt >= MAX_TIMEOUTS) {
-            return AVERROR(ETIMEDOUT);
+            return FF_NETERROR(ETIMEDOUT);
         } else if (n < 0 && errno != EINTR)
             return AVERROR(errno);
     }