From: Clément Bœsch <cboe...@gopro.com>
sndio is already autodetected, this commit makes sure
--disable-autodetect actually disable it unless --enable-sndio is
specified.
---
configure | 5 +++--
libavdevice/Makefile | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index bb7caef5d7..f2af0711e3 100755
--- a/configure
+++ b/configure
@@ -288,6 +288,7 @@ External library support:
--enable-opengl enable OpenGL rendering [no]
--enable-openssl enable openssl, needed for https support
if gnutls is not used [no]
+ --disable-sndio disable sndio support [autodetect]
--disable-schannel disable SChannel SSP, needed for TLS support on
Windows if openssl and gnutls are not used
[autodetect]
--disable-sdl2 disable sdl2 [autodetect]
@@ -1495,6 +1496,7 @@ EXTERNAL_AUTODETECT_LIBRARY_LIST="
schannel
sdl2
securetransport
+ sndio
xlib
zlib
"
@@ -2073,7 +2075,6 @@ HAVE_LIST="
perl
pod2man
section_data_rel_ro
- sndio
texi2html
threads
uwp
@@ -6118,7 +6119,7 @@ enabled alsa && check_lib alsa alsa/asoundlib.h
snd_pcm_htimestamp -lasound
enabled jack && check_lib jack jack/jack.h jack_client_open -ljack &&
check_func jack_port_get_latency_range -ljack
-enabled_any sndio_indev sndio_outdev && check_lib sndio sndio.h sio_open
-lsndio
+enabled sndio && check_lib sndio sndio.h sio_open -lsndio
if enabled libcdio; then
check_lib libcdio "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open
-lcdio_paranoia -lcdio_cdda -lcdio ||
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 58362e3f2d..cd077b292e 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -71,6 +71,6 @@ SKIPHEADERS-$(CONFIG_LIBPULSE) +=
pulse_audio_common.h
SKIPHEADERS-$(CONFIG_V4L2_INDEV) += v4l2-common.h
SKIPHEADERS-$(CONFIG_V4L2_OUTDEV) += v4l2-common.h
SKIPHEADERS-$(CONFIG_ALSA) += alsa.h
-SKIPHEADERS-$(HAVE_SNDIO) += sndio.h
+SKIPHEADERS-$(CONFIG_SNDIO) += sndio.h
TESTPROGS-$(CONFIG_JACK_INDEV) += timefilter
--
2.14.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
