Mercurial > mplayer.hg
diff Makefile @ 33497:ce4d5759f9c1
Change linking order: Due to av_get_cpu_flags libswscale now depends on
libavutil, too, and thus must come before it.
author | reimar |
---|---|
date | Sat, 11 Jun 2011 16:28:37 +0000 |
parents | 4f940d7917f0 |
children | 72e0e995ae86 |
line wrap: on
line diff
--- a/Makefile Sat Jun 11 16:21:54 2011 +0000 +++ b/Makefile Sat Jun 11 16:28:37 2011 +0000 @@ -685,9 +685,10 @@ COMMON_LIBS-$(FFMPEG_A) += ffmpeg/libavformat/libavformat.a \ ffmpeg/libavcodec/libavcodec.a \ + ffmpeg/libpostproc/libpostproc.a \ + ffmpeg/libswscale/libswscale.a \ ffmpeg/libavutil/libavutil.a \ - ffmpeg/libpostproc/libpostproc.a \ - ffmpeg/libswscale/libswscale.a + COMMON_LIBS += $(COMMON_LIBS-yes) OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)))