diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 16:01:26 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 16:01:30 +0100 |
| commit | ba2d37e9ada5239e4b856996136e4ee859863b16 (patch) | |
| tree | 036de2728a2748e27d01f273ba431f411eb7b018 /libavfilter/vf_libopencv.c | |
| parent | f8e89d8a297e034d03aac88c73acd1541167ae5e (diff) | |
| parent | 136c3438bbdb56a5d2f1f0f486f180641dc6dda0 (diff) | |
| download | ffmpeg-ba2d37e9ada5239e4b856996136e4ee859863b16.tar.gz | |
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.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/vf_libopencv.c')
0 files changed, 0 insertions, 0 deletions