diff options
author | Michael Niedermayer | 2014-08-25 13:26:42 +0200 |
---|---|---|
committer | Michael Niedermayer | 2014-08-25 13:27:21 +0200 |
commit | 08a110ca871e82630d5f6f834922014cd375f524 (patch) | |
tree | 6c9569ebd49b54dd5290cb6de8d1b96fb8e7be63 /libavformat/sctp.c | |
parent | 215db2935b06c0e936dadce012a31de7da25ba97 (diff) | |
parent | 6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f (diff) |
Merge commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f'
* commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f':
libavformat: use MSG_NOSIGNAL when applicable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sctp.c')
-rw-r--r-- | libavformat/sctp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/sctp.c b/libavformat/sctp.c index a4406d1e40..35b9ad15ab 100644 --- a/libavformat/sctp.c +++ b/libavformat/sctp.c @@ -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)); } - return sendmsg(s, &outmsg, flags); + return sendmsg(s, &outmsg, flags | MSG_NOSIGNAL); } 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); } else - ret = send(s->fd, buf, size, 0); + ret = send(s->fd, buf, size, MSG_NOSIGNAL); return ret < 0 ? ff_neterrno() : ret; } |