diff options
| author | Diego Biurrun <diego@biurrun.de> | 2017-09-26 16:57:17 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-10-10 23:20:17 +0200 |
| commit | b586903ae1b89e2d8b99c79f33cabe9b3ca03784 (patch) | |
| tree | d5edf7150c66dc7751fd402f8555def112a86833 | |
| parent | 8e97a8c69162afce47abea96c8c0914f3550e212 (diff) | |
| download | ffmpeg-b586903ae1b89e2d8b99c79f33cabe9b3ca03784.tar.gz | |
build: Drop redundant check for soundcard.h
It should be sys/soundcard.h nowadays.
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libavdevice/oss.c | 8 |
2 files changed, 3 insertions, 11 deletions
@@ -1575,7 +1575,6 @@ HEADERS_LIST=" machine_ioctl_meteor_h malloc_h poll_h - soundcard_h stdatomic_h sys_param_h sys_resource_h @@ -2465,8 +2464,8 @@ jack_indev_deps="libjack" jack_indev_deps_any="sem_timedwait dispatch_dispatch_h" libcdio_indev_deps="libcdio" libdc1394_indev_deps="libdc1394" -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" sndio_indev_deps="sndio" sndio_outdev_deps="sndio" @@ -4857,7 +4856,6 @@ check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable vfwcap_def check_header dev/ic/bt8xx.h check_header sys/soundcard.h -check_header soundcard.h enabled_any alsa_indev alsa_outdev && check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound diff --git a/libavdevice/oss.c b/libavdevice/oss.c index eb8d454422..e504438124 100644 --- a/libavdevice/oss.c +++ b/libavdevice/oss.c @@ -22,16 +22,10 @@ #include "config.h" #include <string.h> - -#if HAVE_SOUNDCARD_H -#include <soundcard.h> -#else -#include <sys/soundcard.h> -#endif - #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> +#include <sys/soundcard.h> #include "libavutil/log.h" |