Merge commit 'bb9378251a167ef0116f263912e57f715c1e02ac'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:39:59 +0000 (15:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:40:05 +0000 (15:40 +0200)
* commit 'bb9378251a167ef0116f263912e57f715c1e02ac':
  network: Use SOCK_CLOEXEC when available

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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge