Browse code
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.
Janne Grunau authored on 2014/05/15 21:53:30Showing 1 changed files
| ... | ... |
@@ -83,12 +83,13 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options |
| 83 | 83 |
TOOLS = qt-faststart trasher |
| 84 | 84 |
TOOLS-$(CONFIG_ZLIB) += cws2fws |
| 85 | 85 |
|
| 86 |
-FFLIBS-$(CONFIG_AVDEVICE) += avdevice |
|
| 87 |
-FFLIBS-$(CONFIG_AVFILTER) += avfilter |
|
| 88 |
-FFLIBS-$(CONFIG_AVFORMAT) += avformat |
|
| 86 |
+# $(FFLIBS-yes) needs to be in linking order |
|
| 87 |
+FFLIBS-$(CONFIG_AVDEVICE) += avdevice |
|
| 88 |
+FFLIBS-$(CONFIG_AVFILTER) += avfilter |
|
| 89 |
+FFLIBS-$(CONFIG_AVFORMAT) += avformat |
|
| 90 |
+FFLIBS-$(CONFIG_AVCODEC) += avcodec |
|
| 89 | 91 |
FFLIBS-$(CONFIG_AVRESAMPLE) += avresample |
| 90 |
-FFLIBS-$(CONFIG_AVCODEC) += avcodec |
|
| 91 |
-FFLIBS-$(CONFIG_SWSCALE) += swscale |
|
| 92 |
+FFLIBS-$(CONFIG_SWSCALE) += swscale |
|
| 92 | 93 |
|
| 93 | 94 |
FFLIBS := avutil |
| 94 | 95 |
|