diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 16:01:47 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 16:01:50 +0100 |
| commit | 7e3d3a6a895f80e8a376a3ba37054eb84b44f671 (patch) | |
| tree | 69b8694d440048f56ffc12a035425448c619779c /libavfilter/vf_psnr.c | |
| parent | ba2d37e9ada5239e4b856996136e4ee859863b16 (diff) | |
| parent | 3ee2ec5ec1e39a438f89302d949c93a1b5d365a2 (diff) | |
| download | ffmpeg-7e3d3a6a895f80e8a376a3ba37054eb84b44f671.tar.gz | |
Merge commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2'
* commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2':
unix: Use rw_timeout for setting the connect timeout
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/vf_psnr.c')
0 files changed, 0 insertions, 0 deletions