[FFmpeg-cvslog] Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'
James Almer
git at videolan.org
Sat Nov 11 21:20:50 EET 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 16:18:52 2017 -0300| [fdd03d2d790e5923fb37fa4fc7f6723393355b79] | committer: James Almer
Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'
* commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784':
build: Drop redundant check for soundcard.h
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fdd03d2d790e5923fb37fa4fc7f6723393355b79
---
configure | 6 ++----
libavdevice/oss.c | 7 +------
libavdevice/oss_dec.c | 7 +------
libavdevice/oss_enc.c | 7 +------
4 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/configure b/configure
index 815c1052c9..5275a3601e 100755
--- a/configure
+++ b/configure
@@ -1934,7 +1934,6 @@ HEADERS_LIST="
opencv2_core_core_c_h
OpenGL_gl3_h
poll_h
- soundcard_h
stdatomic_h
sys_param_h
sys_resource_h
@@ -3097,8 +3096,8 @@ libcdio_indev_deps="libcdio"
libdc1394_indev_deps="libdc1394"
openal_indev_deps="openal"
opengl_outdev_deps="opengl"
-oss_indev_deps_any="soundcard_h sys_soundcard_h"
-oss_outdev_deps_any="soundcard_h sys_soundcard_h"
+oss_indev_deps_any="sys_soundcard_h"
+oss_outdev_deps_any="sys_soundcard_h"
pulse_indev_deps="libpulse"
pulse_outdev_deps="libpulse"
sdl2_outdev_deps="sdl2"
@@ -6184,7 +6183,6 @@ else
audio_buf_info abc;
EOF
fi
-check_header soundcard.h
enabled alsa && check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
diff --git a/libavdevice/oss.c b/libavdevice/oss.c
index d74112825b..d92cde3313 100644
--- a/libavdevice/oss.c
+++ b/libavdevice/oss.c
@@ -23,17 +23,12 @@
#include <string.h>
-#if HAVE_SOUNDCARD_H
-#include <soundcard.h>
-#else
-#include <sys/soundcard.h>
-#endif
-
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <fcntl.h>
#include <sys/ioctl.h>
+#include <sys/soundcard.h>
#include "libavutil/log.h"
diff --git a/libavdevice/oss_dec.c b/libavdevice/oss_dec.c
index 9f748f2bc3..6fef96a450 100644
--- a/libavdevice/oss_dec.c
+++ b/libavdevice/oss_dec.c
@@ -23,17 +23,12 @@
#include <stdint.h>
-#if HAVE_SOUNDCARD_H
-#include <soundcard.h>
-#else
-#include <sys/soundcard.h>
-#endif
-
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <fcntl.h>
#include <sys/ioctl.h>
+#include <sys/soundcard.h>
#include "libavutil/internal.h"
#include "libavutil/opt.h"
diff --git a/libavdevice/oss_enc.c b/libavdevice/oss_enc.c
index 2268b4cfe4..e7a7b6d403 100644
--- a/libavdevice/oss_enc.c
+++ b/libavdevice/oss_enc.c
@@ -21,17 +21,12 @@
#include "config.h"
-#if HAVE_SOUNDCARD_H
-#include <soundcard.h>
-#else
-#include <sys/soundcard.h>
-#endif
-
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <fcntl.h>
#include <sys/ioctl.h>
+#include <sys/soundcard.h>
#include "libavutil/internal.h"
======================================================================
diff --cc configure
index 815c1052c9,37b3f20ba4..5275a3601e
--- a/configure
+++ b/configure
@@@ -1931,10 -1574,7 +1931,9 @@@ HEADERS_LIST=
machine_ioctl_bt848_h
machine_ioctl_meteor_h
malloc_h
+ opencv2_core_core_c_h
+ OpenGL_gl3_h
poll_h
- soundcard_h
stdatomic_h
sys_param_h
sys_resource_h
@@@ -3067,41 -2454,19 +3066,41 @@@ xwma_demuxer_select="riffdec
# indevs / outdevs
alsa_indev_deps="alsa"
alsa_outdev_deps="alsa"
-avfoundation_indev_deps="AVFoundation_AVFoundation_h objc_arc pthreads"
-avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia"
+avfoundation_indev_deps="avfoundation corevideo coremedia pthreads"
+avfoundation_indev_suggest="coregraphics applicationservices"
+avfoundation_indev_extralibs="-framework Foundation"
bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
-dv1394_indev_deps="dv1394"
-dv1394_indev_select="dv_demuxer"
+caca_outdev_deps="libcaca"
+decklink_deps_any="libdl LoadLibrary"
+decklink_indev_deps="decklink threads"
+decklink_indev_extralibs="-lstdc++"
+decklink_outdev_deps="decklink threads"
+decklink_outdev_extralibs="-lstdc++"
+libndi_newtek_indev_deps="libndi_newtek"
+libndi_newtek_indev_extralibs="-lndi"
+libndi_newtek_outdev_deps="libndi_newtek"
+libndi_newtek_outdev_extralibs="-lndi"
+dshow_indev_deps="IBaseFilter"
+dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi"
fbdev_indev_deps="linux_fb_h"
+fbdev_outdev_deps="linux_fb_h"
+gdigrab_indev_deps="CreateDIBSection"
+gdigrab_indev_extralibs="-lgdi32"
+gdigrab_indev_select="bmp_decoder"
+iec61883_indev_deps="libiec61883"
jack_indev_deps="libjack"
jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
+kmsgrab_indev_deps="libdrm"
+lavfi_indev_deps="avfilter"
libcdio_indev_deps="libcdio"
libdc1394_indev_deps="libdc1394"
+openal_indev_deps="openal"
+opengl_outdev_deps="opengl"
- oss_indev_deps_any="soundcard_h sys_soundcard_h"
- oss_outdev_deps_any="soundcard_h sys_soundcard_h"
+ oss_indev_deps_any="sys_soundcard_h"
+ oss_outdev_deps_any="sys_soundcard_h"
pulse_indev_deps="libpulse"
+pulse_outdev_deps="libpulse"
+sdl2_outdev_deps="sdl2"
sndio_indev_deps="sndio"
sndio_outdev_deps="sndio"
v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
@@@ -6176,17 -4855,9 +6175,16 @@@ check_type "dshow.h" IBaseFilte
check_header dev/video/bktr/ioctl_bt848.h; } ||
check_header dev/ic/bt8xx.h
-check_header sys/soundcard.h
+if check_struct sys/soundcard.h audio_buf_info bytes; then
+ enable_sanitized sys/soundcard.h
+else
+ check_cc -D__BSD_VISIBLE -D__XSI_VISIBLE <<EOF && add_cppflags -D__BSD_VISIBLE -D__XSI_VISIBLE && enable_sanitized sys/soundcard.h
+ #include <sys/soundcard.h>
+ audio_buf_info abc;
+EOF
+fi
- check_header soundcard.h
-enabled_any alsa_indev alsa_outdev &&
+enabled alsa && check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
enabled libjack &&
diff --cc libavdevice/oss.c
index d74112825b,e504438124..d92cde3313
--- a/libavdevice/oss.c
+++ b/libavdevice/oss.c
@@@ -22,18 -22,10 +22,13 @@@
#include "config.h"
#include <string.h>
+
- #if HAVE_SOUNDCARD_H
- #include <soundcard.h>
- #else
- #include <sys/soundcard.h>
- #endif
-
+#if HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <fcntl.h>
#include <sys/ioctl.h>
+ #include <sys/soundcard.h>
#include "libavutil/log.h"
diff --cc libavdevice/oss_dec.c
index 9f748f2bc3,6f51a30662..6fef96a450
--- a/libavdevice/oss_dec.c
+++ b/libavdevice/oss_dec.c
@@@ -23,17 -23,15 +23,12 @@@
#include <stdint.h>
--#if HAVE_SOUNDCARD_H
--#include <soundcard.h>
--#else
--#include <sys/soundcard.h>
--#endif
--
+#if HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <fcntl.h>
#include <sys/ioctl.h>
++#include <sys/soundcard.h>
#include "libavutil/internal.h"
#include "libavutil/opt.h"
diff --cc libavdevice/oss_enc.c
index 2268b4cfe4,eb6432ced0..e7a7b6d403
--- a/libavdevice/oss_enc.c
+++ b/libavdevice/oss_enc.c
@@@ -21,17 -21,15 +21,12 @@@
#include "config.h"
--#if HAVE_SOUNDCARD_H
--#include <soundcard.h>
--#else
--#include <sys/soundcard.h>
--#endif
--
+#if HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <fcntl.h>
#include <sys/ioctl.h>
++#include <sys/soundcard.h>
#include "libavutil/internal.h"
More information about the ffmpeg-cvslog
mailing list