summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-10-15 12:59:45 +0000
committerDiego Biurrun <diego@biurrun.de>2006-10-15 12:59:45 +0000
commit14f29f795d6b1a8a7d864ff97d6302bfe6fb0ba9 (patch)
treeb56f33bdd6218dbc1d7dea341b90e7bf303ec4f1 /libavformat
parent84471efd91a1599bf5c83bc2f7307017e27b4bd9 (diff)
Revert putting EXTRALIBS in common.mak, linking fails on MinGW.
Originally committed as revision 6700 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 95be67b298..8c8e2b7073 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -161,7 +161,8 @@ OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
endif
-EXTRALIBS := -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
+EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
+ -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
ifeq ($(CONFIG_AUDIO_BEOS),yes)
CPPOBJS+= beosaudio.o