Michael Niedermayer 296eaa84b9 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>

2013-08-10 10:18:18 +02:00

9.9 KiB

Raw Blame History

View Raw