From 5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Thu, 15 May 2014 14:53:30 +0200 Subject: build: add avresample after avcodec to FFLIBS avcodec might depend on avresample and with --as-needed required symbols might be get removed if avresample is linked before avcodec. Fixes link failures of avprobe and avplay on aarch64 with --enable-neon-clobber-test. --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fd605218cf..71c068ca0e 100644 --- a/Makefile +++ b/Makefile @@ -83,12 +83,13 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options TOOLS = qt-faststart trasher TOOLS-$(CONFIG_ZLIB) += cws2fws -FFLIBS-$(CONFIG_AVDEVICE) += avdevice -FFLIBS-$(CONFIG_AVFILTER) += avfilter -FFLIBS-$(CONFIG_AVFORMAT) += avformat +# $(FFLIBS-yes) needs to be in linking order +FFLIBS-$(CONFIG_AVDEVICE) += avdevice +FFLIBS-$(CONFIG_AVFILTER) += avfilter +FFLIBS-$(CONFIG_AVFORMAT) += avformat +FFLIBS-$(CONFIG_AVCODEC) += avcodec FFLIBS-$(CONFIG_AVRESAMPLE) += avresample -FFLIBS-$(CONFIG_AVCODEC) += avcodec -FFLIBS-$(CONFIG_SWSCALE) += swscale +FFLIBS-$(CONFIG_SWSCALE) += swscale FFLIBS := avutil -- cgit v1.2.3