diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2007-09-07 13:43:40 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2007-09-07 13:43:40 +0000 |
| commit | 50383e8822dfd6c8c98d76b511a733d1246683bb (patch) | |
| tree | dbe34ce4d1a97cd0a1f027adf3214b56bb852dc6 /libavformat/Makefile | |
| parent | bf61632b123cf92864173a6f40b5a0c821f6b078 (diff) | |
| download | ffmpeg-50383e8822dfd6c8c98d76b511a733d1246683bb.tar.gz | |
Separate audio_(de)muxer into oss_(de)muxer and audio_beos_(de)muxer
Originally committed as revision 10426 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 0d22fcaf9c..c7d4fadd88 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -25,8 +25,6 @@ OBJS-$(CONFIG_ASF_MUXER) += asf-enc.o riff.o OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.o riff.o OBJS-$(CONFIG_AU_DEMUXER) += au.o raw.o OBJS-$(CONFIG_AU_MUXER) += au.o -OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o -OBJS-$(CONFIG_AUDIO_MUXER) += audio.o OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o OBJS-$(CONFIG_AVISYNTH) += avisynth.o @@ -113,6 +111,8 @@ OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \ oggparseogm.o \ riff.o OBJS-$(CONFIG_OGG_MUXER) += ogg.o +OBJS-$(CONFIG_OSS_DEMUXER) += audio.o +OBJS-$(CONFIG_OSS_MUXER) += audio.o OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.o OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o @@ -163,7 +163,8 @@ OBJS-$(CONFIG_VHOOK) += framehook.o EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \ -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS) -CPPOBJS-$(CONFIG_AUDIO_BEOS) += beosaudio.o +CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o +CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o # protocols I/O OBJS+= avio.o aviobuf.o |