From ce09d560b7e42a9ef60bbb85c6ba1e1ffc2aa16f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jind=C5=99ich=20Makovi=C4=8Dka?= Date: Mon, 17 Nov 2008 07:50:25 +0000 Subject: [PATCH] Get rid of MSG_DONTWAIT using a more standard way to use a socket in a non blocked mode. Patch by Jindrich Makovicka: makovick gmail Originally committed as revision 15846 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/udp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index a8e8cd8bc..bbdb930e4 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -437,6 +437,8 @@ static int udp_open(URLContext *h, const char *uri, int flags) if (setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp)) < 0) { av_log(NULL, AV_LOG_WARNING, "setsockopt(SO_RECVBUF): %s\n", strerror(errno)); } + /* make the socket non-blocking */ + ff_socket_nonblock(udp_fd, 1); } s->udp_fd = udp_fd; @@ -468,7 +470,7 @@ static int udp_read(URLContext *h, uint8_t *buf, int size) return AVERROR(EIO); if (!(ret > 0 && FD_ISSET(s->udp_fd, &rfds))) continue; - len = recv(s->udp_fd, buf, size, MSG_DONTWAIT); + len = recv(s->udp_fd, buf, size, 0); if (len < 0) { if (ff_neterrno() != FF_NETERROR(EAGAIN) && ff_neterrno() != FF_NETERROR(EINTR)) -- 2.11.0