git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Sat, 10 Aug 2013 08:18:18 +0000 (10:18 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sat, 10 Aug 2013 08:18:18 +0000 (10:18 +0200)
commit	296eaa84b9d0659b48014917f99032b3fa725302
tree	5646cfaf430551b321c83e301cb69dbf76638cdb	tree \| snapshot
parent	69f543854deb8c31183b20ca72e10e78d3296f53	commit \| diff
parent	9d5ec50ead97e088d77317e77b18cef06cb3d053	commit \| diff

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>

libavformat/network.c	diff1 \|	diff2 \|	blob \| history
libavformat/network.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

libavformat/network.c	diff1 \|	diff2 \|	blob \| history
libavformat/network.h	diff1 \|	diff2 \|	blob \| history