mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 08:42:39 +00:00
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. Originally committed as revision 22887 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e58c05bb3c
commit
4aecee7fc3
@ -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
|
||||
|
@ -1692,7 +1692,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
|
||||
}
|
||||
#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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user