Module: libav Branch: master Commit: 5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f
Author: Janne Grunau <[email protected]> Committer: Janne Grunau <[email protected]> Date: Thu May 15 14:53:30 2014 +0200 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(-) diff --git a/Makefile b/Makefile index fd60521..71c068c 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 _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
