diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 01:56:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 01:56:57 +0200 |
| commit | 5b602a140f3c071b67572ce5af2eb0469c5c8bed (patch) | |
| tree | 2a47d6f024cb6960012d958745c753eae45466ed /libavdevice/Makefile | |
| parent | d000c5ae7e375ddf45215c550e9b2b815d3677af (diff) | |
| parent | 796cd225dabd3b53340b7c6defc5e5e654de23d7 (diff) | |
Merge remote-tracking branch 'luzero/pulse'
* luzero/pulse:
pulse: cosmetics
pulse: introduce pulseaudio input
Conflicts:
Changelog
configure
libavdevice/Makefile
libavdevice/alldevices.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/Makefile')
| -rw-r--r-- | libavdevice/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 97dd380776..a640a04a59 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -24,6 +24,7 @@ OBJS-$(CONFIG_LAVFI_INDEV) += lavfi.o OBJS-$(CONFIG_OPENAL_INDEV) += openal-dec.o OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o +OBJS-$(CONFIG_PULSE_INDEV) += pulse.o OBJS-$(CONFIG_SDL_OUTDEV) += sdl.o OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o |