virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

Merge commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f'

Browse Source 
* commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f':
  libavformat: use MSG_NOSIGNAL when applicable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-25 13:26:42 +02:00
commit 08a110ca87
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/network.h
View File

@ -111,6 +111,10 @@ struct sockaddr_storage {
}; };
#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */ #endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0
#endif
#if !HAVE_STRUCT_ADDRINFO #if !HAVE_STRUCT_ADDRINFO
struct addrinfo { struct addrinfo {
int ai_flags; int ai_flags;

4
libavformat/sctp.c
View File

@ -143,7 +143,7 @@ static int ff_sctp_send(int s, const void *msg, size_t len,
memcpy(CMSG_DATA(cmsg), sinfo, sizeof(struct sctp_sndrcvinfo)); memcpy(CMSG_DATA(cmsg), sinfo, sizeof(struct sctp_sndrcvinfo));
} }
return sendmsg(s, &outmsg, flags); return sendmsg(s, &outmsg, flags | MSG_NOSIGNAL);
} }
typedef struct SCTPContext { typedef struct SCTPContext {
@ -302,7 +302,7 @@ static int sctp_write(URLContext *h, const uint8_t *buf, int size)
} }
ret = ff_sctp_send(s->fd, buf + 2, size - 2, &info, MSG_EOR); ret = ff_sctp_send(s->fd, buf + 2, size - 2, &info, MSG_EOR);
} else } else
ret = send(s->fd, buf, size, 0); ret = send(s->fd, buf, size, MSG_NOSIGNAL);
return ret < 0 ? ff_neterrno() : ret; return ret < 0 ? ff_neterrno() : ret;
} }

2
libavformat/tcp.c
View File

@ -186,7 +186,7 @@ static int tcp_write(URLContext *h, const uint8_t *buf, int size)
if (ret) if (ret)
return ret; return ret;
} }
ret = send(s->fd, buf, size, 0); ret = send(s->fd, buf, size, MSG_NOSIGNAL);
return ret < 0 ? ff_neterrno() : ret; return ret < 0 ? ff_neterrno() : ret;
} }

2
libavformat/unix.c
View File

@ -123,7 +123,7 @@ static int unix_write(URLContext *h, const uint8_t *buf, int size)
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
ret = send(s->fd, buf, size, 0); ret = send(s->fd, buf, size, MSG_NOSIGNAL);
return ret < 0 ? ff_neterrno() : ret; return ret < 0 ? ff_neterrno() : ret;
} }