diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:32:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:33:12 +0200 |
| commit | 8d06ce79411fc99d200ddc559bf1dd1f1434a13c (patch) | |
| tree | 9332563780b673ce8695945f8232b28923007ce4 /configure | |
| parent | 560e9365b6eb6ce34eddea1a582047e09022fcb0 (diff) | |
| parent | 605387582bd35920b83a26dabbe1c0601f425621 (diff) | |
| download | ffmpeg-8d06ce79411fc99d200ddc559bf1dd1f1434a13c.tar.gz | |
Merge commit '605387582bd35920b83a26dabbe1c0601f425621'
* commit '605387582bd35920b83a26dabbe1c0601f425621':
lavf: Support unix sockets
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1535,6 +1535,7 @@ HAVE_LIST=" sys_select_h sys_soundcard_h sys_time_h + sys_un_h sys_videoio_h termios_h texi2html @@ -2128,6 +2129,8 @@ tcp_protocol_select="network" tls_protocol_deps_any="openssl gnutls" tls_protocol_select="tcp_protocol" udp_protocol_select="network" +unix_protocol_deps="sys_un_h" +unix_protocol_select="network" # filters aconvert_filter_deps="swresample" @@ -4064,6 +4067,7 @@ check_header sys/param.h check_header sys/resource.h check_header sys/select.h check_header sys/time.h +check_header sys/un.h check_header termios.h check_header unistd.h check_header vdpau/vdpau.h |