Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
b586903a
Commit
b586903a
authored
Sep 26, 2017
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: Drop redundant check for soundcard.h
It should be sys/soundcard.h nowadays.
parent
8e97a8c6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
11 deletions
+3
-11
configure
configure
+2
-4
oss.c
libavdevice/oss.c
+1
-7
No files found.
configure
View file @
b586903a
...
@@ -1575,7 +1575,6 @@ HEADERS_LIST="
...
@@ -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"
...
@@ -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
=
"s
oundcard_h s
ys_soundcard_h"
oss_indev_deps_any
=
"sys_soundcard_h"
oss_outdev_deps_any
=
"s
oundcard_h s
ys_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
...
@@ -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
...
...
libavdevice/oss.c
View file @
b586903a
...
@@ -22,16 +22,10 @@
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment