diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-20 18:15:08 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-20 18:15:08 +0100 |
| commit | 8700700de8a4103724796077034f7f254ad974bc (patch) | |
| tree | 2fce4dee518a202c45c3f16567db36edc92ed914 /TOOLS/travis-deps | |
| parent | e6b85c91700bee0ddc92e98a30d5021691bd6f65 (diff) | |
| parent | eafc273d2c2ae6d247d741202e58ca23dc938cb2 (diff) | |
| download | mpv-8700700de8a4103724796077034f7f254ad974bc.tar.bz2 mpv-8700700de8a4103724796077034f7f254ad974bc.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'TOOLS/travis-deps')
| -rwxr-xr-x | TOOLS/travis-deps | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/TOOLS/travis-deps b/TOOLS/travis-deps index 194f183d1d..20825568b0 100755 --- a/TOOLS/travis-deps +++ b/TOOLS/travis-deps @@ -107,7 +107,7 @@ class Libav < TravisDepsBuilder end def configure - [super, "--cc=#{ENV['CC']}"].join(" ") + [super, "--cc=#{ENV['CC']} --disable-asm"].join(" ") end end |