mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
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.
This commit is contained in:
parent
3b2fbe67bd
commit
5e2ba41d4b
11
Makefile
11
Makefile
@ -83,12 +83,13 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options
|
|||||||
TOOLS = qt-faststart trasher
|
TOOLS = qt-faststart trasher
|
||||||
TOOLS-$(CONFIG_ZLIB) += cws2fws
|
TOOLS-$(CONFIG_ZLIB) += cws2fws
|
||||||
|
|
||||||
FFLIBS-$(CONFIG_AVDEVICE) += avdevice
|
# $(FFLIBS-yes) needs to be in linking order
|
||||||
FFLIBS-$(CONFIG_AVFILTER) += avfilter
|
FFLIBS-$(CONFIG_AVDEVICE) += avdevice
|
||||||
FFLIBS-$(CONFIG_AVFORMAT) += avformat
|
FFLIBS-$(CONFIG_AVFILTER) += avfilter
|
||||||
|
FFLIBS-$(CONFIG_AVFORMAT) += avformat
|
||||||
|
FFLIBS-$(CONFIG_AVCODEC) += avcodec
|
||||||
FFLIBS-$(CONFIG_AVRESAMPLE) += avresample
|
FFLIBS-$(CONFIG_AVRESAMPLE) += avresample
|
||||||
FFLIBS-$(CONFIG_AVCODEC) += avcodec
|
FFLIBS-$(CONFIG_SWSCALE) += swscale
|
||||||
FFLIBS-$(CONFIG_SWSCALE) += swscale
|
|
||||||
|
|
||||||
FFLIBS := avutil
|
FFLIBS := avutil
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user