Merge commit '9d5ec50ead97e088d77317e77b18cef06cb3d053'

* commit '9d5ec50ead97e088d77317e77b18cef06cb3d053':
  ff_socket: put out-of-line and fallback to fcntl() for close-on-exec

Conflicts:
	libavformat/network.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/network.c
index a41b0511e415379288f57bd0cd40e607d569b39b,6d308ebd012e2eee57ccd2786bdf09db6bdc2053..73409616cddabf91d4c8d7941fb657f9045833a7
--- 1/libavformat/network.c
--- 2/libavformat/network.c
+++ b/libavformat/network.c
@@@ -22,9 -22,7 +22,10 @@@
  #include "network.h"
  #include "url.h"
  #include "libavcodec/internal.h"
++#include "libavutil/avutil.h"
  #include "libavutil/mem.h"
 +#include "url.h"
 +#include "libavutil/time.h"
  
  #if HAVE_THREADS
  #if HAVE_PTHREADS

diff --cc libavformat/network.h
Simple merge