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 /libavdevice | |
| parent | 1a4315f24d2c5857ebeb379fe39f0124746ee30a (diff) | |
| parent | b586903ae1b89e2d8b99c79f33cabe9b3ca03784 (diff) | |
| download | ffmpeg-streaming-fdd03d2d790e5923fb37fa4fc7f6723393355b79.zip ffmpeg-streaming-fdd03d2d790e5923fb37fa4fc7f6723393355b79.tar.gz | |
Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'
* commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784':
build: Drop redundant check for soundcard.h
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/oss.c | 7 | ||||
| -rw-r--r-- | libavdevice/oss_dec.c | 7 | ||||
| -rw-r--r-- | libavdevice/oss_enc.c | 7 |
3 files changed, 3 insertions, 18 deletions
diff --git a/libavdevice/oss.c b/libavdevice/oss.c index d741128..d92cde3 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 9f748f2..6fef96a 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 2268b4c..e7a7b6d 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" |
