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 -#if HAVE_SOUNDCARD_H -#include -#else -#include -#endif - #if HAVE_UNISTD_H #include #endif #include #include +#include #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 -#if HAVE_SOUNDCARD_H -#include -#else -#include -#endif - #if HAVE_UNISTD_H #include #endif #include #include +#include #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 -#else -#include -#endif - #if HAVE_UNISTD_H #include #endif #include #include +#include #include "libavutil/internal.h"