mirror of https://git.ffmpeg.org/ffmpeg.git
build: Drop redundant check for soundcard.h
It should be sys/soundcard.h nowadays.
This commit is contained in:
parent
8e97a8c691
commit
b586903ae1
|
@ -1575,7 +1575,6 @@ HEADERS_LIST="
|
||||||
machine_ioctl_meteor_h
|
machine_ioctl_meteor_h
|
||||||
malloc_h
|
malloc_h
|
||||||
poll_h
|
poll_h
|
||||||
soundcard_h
|
|
||||||
stdatomic_h
|
stdatomic_h
|
||||||
sys_param_h
|
sys_param_h
|
||||||
sys_resource_h
|
sys_resource_h
|
||||||
|
@ -2465,8 +2464,8 @@ jack_indev_deps="libjack"
|
||||||
jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
|
jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
|
||||||
libcdio_indev_deps="libcdio"
|
libcdio_indev_deps="libcdio"
|
||||||
libdc1394_indev_deps="libdc1394"
|
libdc1394_indev_deps="libdc1394"
|
||||||
oss_indev_deps_any="soundcard_h sys_soundcard_h"
|
oss_indev_deps_any="sys_soundcard_h"
|
||||||
oss_outdev_deps_any="soundcard_h sys_soundcard_h"
|
oss_outdev_deps_any="sys_soundcard_h"
|
||||||
pulse_indev_deps="libpulse"
|
pulse_indev_deps="libpulse"
|
||||||
sndio_indev_deps="sndio"
|
sndio_indev_deps="sndio"
|
||||||
sndio_outdev_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 dev/ic/bt8xx.h
|
||||||
|
|
||||||
check_header sys/soundcard.h
|
check_header sys/soundcard.h
|
||||||
check_header soundcard.h
|
|
||||||
|
|
||||||
enabled_any alsa_indev alsa_outdev &&
|
enabled_any alsa_indev alsa_outdev &&
|
||||||
check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
|
check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
|
||||||
|
|
|
@ -22,16 +22,10 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#if HAVE_SOUNDCARD_H
|
|
||||||
#include <soundcard.h>
|
|
||||||
#else
|
|
||||||
#include <sys/soundcard.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/soundcard.h>
|
||||||
|
|
||||||
#include "libavutil/log.h"
|
#include "libavutil/log.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue