ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Thu Apr 21 16:01:26 2016 +0100| [ba2d37e9ada5239e4b856996136e4ee859863b16] | committer: Derek Buitenhuis
Merge commit '136c3438bbdb56a5d2f1f0f486f180641dc6dda0' This commit is a no-op. * commit '136c3438bbdb56a5d2f1f0f486f180641dc6dda0': tcp: Use rw_timeout for setting the connect/listen timeouts Merged-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba2d37e9ada5239e4b856996136e4ee859863b16 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
