projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7038fa6
)
Audio (de)muxer dependency on OSS is handled by configure.
author
Diego Biurrun
<diego@biurrun.de>
Tue, 3 Apr 2007 15:56:21 +0000
(15:56 +0000)
committer
Diego Biurrun
<diego@biurrun.de>
Tue, 3 Apr 2007 15:56:21 +0000
(15:56 +0000)
Originally committed as revision 8613 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/Makefile
patch
|
blob
|
history
diff --git
a/libavformat/Makefile
b/libavformat/Makefile
index
f1339bd
..
93bef87
100644
(file)
--- 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)