diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 13:39:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 13:39:12 +0200 |
commit | 80acedae3ed55902b6a15ba5ea121a8dfc7a880a (patch) | |
tree | acf6807b88f8bcba1f0b1c4ba5455f3a41b67a57 /libavdevice/Makefile | |
parent | 54cba3f53efd80442015a0ba5ba25252e8096290 (diff) | |
parent | d6e1d37100af568211f28ec0bcf7958a3a2a299e (diff) | |
download | ffmpeg-80acedae3ed55902b6a15ba5ea121a8dfc7a880a.tar.gz |
Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'
* commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e':
oss_audio: Split muxer and demuxer
Conflicts:
libavdevice/Makefile
libavdevice/oss_audio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/Makefile')
-rw-r--r-- | libavdevice/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 767df19aa7..db301e7112 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -31,8 +31,8 @@ OBJS-$(CONFIG_JACK_INDEV) += jack_audio.o timefilter.o OBJS-$(CONFIG_LAVFI_INDEV) += lavfi.o OBJS-$(CONFIG_OPENAL_INDEV) += openal-dec.o OBJS-$(CONFIG_OPENGL_OUTDEV) += opengl_enc.o -OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o -OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o +OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o oss_audio_dec.o +OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o oss_audio_enc.o OBJS-$(CONFIG_PULSE_INDEV) += pulse_audio_dec.o \ pulse_audio_common.o OBJS-$(CONFIG_PULSE_OUTDEV) += pulse_audio_enc.o \ |