Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:18:52 +0000 (16:18 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:19:50 +0000 (16:19 -0300)
* commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784':
  build: Drop redundant check for soundcard.h

Merged-by: James Almer <jamrial@gmail.com>
configure
libavdevice/oss.c
libavdevice/oss_dec.c
libavdevice/oss_enc.c

index 815c105..5275a36 100755 (executable)
--- 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
index d741128..d92cde3 100644 (file)
 
 #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"
 
index 9f748f2..6fef96a 100644 (file)
 
 #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"
index 2268b4c..e7a7b6d 100644 (file)
 
 #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"