highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'

Browse Source 
* commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784':
  build: Drop redundant check for soundcard.h

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-11-11 16:18:52 -03:00
parent 1a4315f24d b586903ae1
commit fdd03d2d79
4 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavdevice/oss.c
View File

@@ -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"

7
libavdevice/oss_dec.c
View File

@@ -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"

7
libavdevice/oss_enc.c
View File

@@ -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"