Link to libraries in dependency order.

Based on a patch by Gonzalo Garramuño, ggarra advancedsl com ar

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11515 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 7d6e64371ba5e66700c476793a8730c69aa54ea3..6047c11cb7eeefa16a6b615245b7d6b62133a8b6 100644 (file)
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -4,9 +4,9 @@ NAME=avdevice
 LIBVERSION=$(LAVDVERSION)
 LIBMAJOR=$(LAVDMAJOR)
 
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil   -lavutil$(BUILDSUF)  \
+EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) \
              -L$(BUILD_ROOT)/libavcodec  -lavcodec$(BUILDSUF) \
-             -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) $(EXTRALIBS)
+             -L$(BUILD_ROOT)/libavutil   -lavutil$(BUILDSUF) $(EXTRALIBS)
 
 CFLAGS += -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat
 

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 1d95a4c615f8518a5ccabc9ce4800fa3263246cc..97c4440636a9b225f9124a0c19d50c1dd92bcb97 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -158,8 +158,8 @@ OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
 
 OBJS-$(CONFIG_VHOOK)                     += framehook.o
 
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
-             -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) $(EXTRALIBS)
+EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
+             -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
 
 # protocols I/O
 OBJS+= avio.o aviobuf.o