[FFmpeg-cvslog] Merge commit '9d5ec50ead97e088d77317e77b18cef06cb3d053'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 10 10:18:18 2013 +0200| [296eaa84b9d0659b48014917f99032b3fa725302] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=296eaa84b9d0659b48014917f99032b3fa725302
---