diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 16:18:52 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 16:19:50 -0300 |
| commit | fdd03d2d790e5923fb37fa4fc7f6723393355b79 (patch) | |
| tree | 9ff80412c71c6f1eea73e1d76ecf53b00c03488a | |
| parent | 1a4315f24d2c5857ebeb379fe39f0124746ee30a (diff) | |
| parent | b586903ae1b89e2d8b99c79f33cabe9b3ca03784 (diff) | |
Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'
* commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784':
build: Drop redundant check for soundcard.h
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libavdevice/oss.c | 7 | ||||
| -rw-r--r-- | libavdevice/oss_dec.c | 7 | ||||
| -rw-r--r-- | libavdevice/oss_enc.c | 7 |
4 files changed, 5 insertions, 22 deletions
@@ -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" |