diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-25 13:26:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-25 13:27:21 +0200 |
| commit | 08a110ca871e82630d5f6f834922014cd375f524 (patch) | |
| tree | 6c9569ebd49b54dd5290cb6de8d1b96fb8e7be63 /libavformat/tcp.c | |
| parent | 215db2935b06c0e936dadce012a31de7da25ba97 (diff) | |
| parent | 6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f (diff) | |
| download | ffmpeg-08a110ca871e82630d5f6f834922014cd375f524.tar.gz | |
Merge commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f'
* commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f':
libavformat: use MSG_NOSIGNAL when applicable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tcp.c')
| -rw-r--r-- | libavformat/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/tcp.c b/libavformat/tcp.c index e457fba94f..3c3f4f53ab 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -186,7 +186,7 @@ static int tcp_write(URLContext *h, const uint8_t *buf, int size) if (ret) return ret; } - ret = send(s->fd, buf, size, 0); + ret = send(s->fd, buf, size, MSG_NOSIGNAL); return ret < 0 ? ff_neterrno() : ret; } |