Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-04-15 19:42:30 +0300
committerClément Bœsch <u@pkh.me>2017-04-17 10:28:34 +0300
commit9ae1ffe64126bda204e498c83e414dad7ff078f8 (patch)
tree3a666330b330034daad4b838c1af19da12c4ebf5 /libavdevice/Makefile
parent3390a2be9deb1ce2bb10163106f1ba8e4ea8ad04 (diff)
parent1818a640cfdccd52e97edf13564f45bc3d0d93eb (diff)
Merge commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb'
* commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb': build: Fix dependencies for alsa/jack/sndio support Added explicit enable (which will be automatically added later on in ee480790c) to actually fix this commit. Without the explicit enables, alsa, jack and sndio gets disabled. Also added jack, alsa and sndio to the have list so the HAVE_* are populated to make (this fixes the SKIPHEADERS chunks). Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavdevice/Makefile')
-rw-r--r--libavdevice/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 78c42e6564..6139f1944d 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -66,7 +66,7 @@ SKIPHEADERS-$(CONFIG_FBDEV_OUTDEV) += fbdev_common.h
SKIPHEADERS-$(CONFIG_LIBPULSE) += pulse_audio_common.h
SKIPHEADERS-$(CONFIG_V4L2_INDEV) += v4l2-common.h
SKIPHEADERS-$(CONFIG_V4L2_OUTDEV) += v4l2-common.h
-SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa.h
-SKIPHEADERS-$(HAVE_SNDIO_H) += sndio.h
+SKIPHEADERS-$(HAVE_ALSA) += alsa.h
+SKIPHEADERS-$(HAVE_SNDIO) += sndio.h
TESTPROGS-$(CONFIG_JACK_INDEV) += timefilter