diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2018-10-22 14:19:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-22 14:19:44 +0200 |
| commit | d1146662169170c35fdd065b9b997023c967144a (patch) | |
| tree | cc818373d3f7934563d096e9775a6316491ed476 /tools | |
| parent | 43da7398588cc5e804d3fb351c222acc64e94015 (diff) | |
| parent | 9d1fd0aa4fea762f6dfe8197a749a05d7ba119cd (diff) | |
Merge pull request #14615 from djp952/android-x86-depends
Fix NDK r18 Android x86 ffmpeg dependency build
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index af9f956bdb..47acb73bdd 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -38,6 +38,7 @@ ifeq ($(OS), android) ffmpg_config += --cpu=cortex-a9 else ffmpg_config += --cpu=i686 --disable-mmx + ffmpg_config += --extra-cflags=-no-integrated-as --extra-cflags=-mno-stackrealign endif endif ffmpg_config += --target-os=linux --extra-libs=-liconv --disable-linux-perf |