aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-04-03 15:56:21 +0000
committerDiego Biurrun <diego@biurrun.de>2007-04-03 15:56:21 +0000
commite64271c2fef7ff83379b61ac958518e5f99dd0cf (patch)
treeb5c3052dbf96b30a76c853e15a9eafc598063c03
parent7038fa6102071ecf7457cdf4730b88d41863f78f (diff)
downloadffmpeg-e64271c2fef7ff83379b61ac958518e5f99dd0cf.tar.gz
Audio (de)muxer dependency on OSS is handled by configure.
Originally committed as revision 8613 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index f1339bd9d4..93bef87984 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -150,10 +150,8 @@ ifeq ($(CONFIG_BKTR),yes)
OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o
endif
-ifeq ($(CONFIG_AUDIO_OSS),yes)
OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
-endif
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
-lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)