diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 01:50:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 01:50:36 +0200 |
| commit | 25d8099beb4c7eb93539f9162af1336ef7130fed (patch) | |
| tree | 4f668222da738409baf5ad8a1ee9d1c9f9004f96 /libavdevice/Makefile | |
| parent | 57e2ded4234356c26bf92b0a627ec383ea8d288f (diff) | |
| parent | 991f3de1bb696a55f7604e4b7d53492299fe44b5 (diff) | |
| download | ffmpeg-25d8099beb4c7eb93539f9162af1336ef7130fed.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED: Remove arrozcru URL from documentation
sndio support for playback and record
Conflicts:
doc/faq.texi
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/Makefile')
| -rw-r--r-- | libavdevice/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 472cb95f50..5cfc5e8ecc 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -18,6 +18,8 @@ OBJS-$(CONFIG_FBDEV_INDEV) += fbdev.o OBJS-$(CONFIG_JACK_INDEV) += jack_audio.o OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o +OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o +OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o OBJS-$(CONFIG_V4L_INDEV) += v4l.o OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o @@ -27,5 +29,6 @@ OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV) += x11grab.o OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h +SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h include $(SUBDIR)../subdir.mak |