Merge commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Aug 2014 11:26:42 +0000 (13:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Aug 2014 11:27:21 +0000 (13:27 +0200)
commit08a110ca871e82630d5f6f834922014cd375f524
tree6c9569ebd49b54dd5290cb6de8d1b96fb8e7be63
parent215db2935b06c0e936dadce012a31de7da25ba97
parent6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f
Merge commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/network.h
libavformat/sctp.c
libavformat/tcp.c
libavformat/unix.c