[MPlayer-cvslog] r33585 - trunk/Makefile

[reimar]

Author: reimar
Date: Sat Jun 11 18:28:37 2011
New Revision: 33585

Log:
Change linking order: Due to av_get_cpu_flags libswscale now depends on
libavutil, too, and thus must come before it.

Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sat Jun 11 18:21:54 2011	(r33584)
+++ trunk/Makefile	Sat Jun 11 18:28:37 2011	(r33585)
@@ -685,9 +685,10 @@ SRCS_MENCODER = mencoder.c \
 
 COMMON_LIBS-$(FFMPEG_A) += ffmpeg/libavformat/libavformat.a \
                            ffmpeg/libavcodec/libavcodec.a   \
-                           ffmpeg/libavutil/libavutil.a     \
                            ffmpeg/libpostproc/libpostproc.a \
-                           ffmpeg/libswscale/libswscale.a
+                           ffmpeg/libswscale/libswscale.a   \
+                           ffmpeg/libavutil/libavutil.a     \
+
 COMMON_LIBS += $(COMMON_LIBS-yes)
 
 OBJS_COMMON    += $(addsuffix .o, $(basename $(SRCS_COMMON)))