]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'f01c77157789b8e3a59ed2c9646faf8299e41641'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 20:26:58 +0000 (21:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 20:27:23 +0000 (21:27 +0100)
* commit 'f01c77157789b8e3a59ed2c9646faf8299e41641':
  fate: add explicit support for the toolchain configure option

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate.sh

diff --cc tests/fate.sh
index 5a78018b4286d98956940338a25da9eaf0813de7,f9f8b9581083e17bf401de0569cf42759db0ceb0..81224b63bec8efaa78c3928c667d96aff6442341
@@@ -47,10 -47,9 +47,11 @@@ configure()
          --prefix="${inst}"                                              \
          --samples="${samples}"                                          \
          --enable-gpl                                                    \
 +        --enable-memory-poisoning                                       \
 +        --enable-avresample                                             \
          ${arch:+--arch=$arch}                                           \
          ${cpu:+--cpu="$cpu"}                                            \
+         ${toolchain:+--toolchain="$toolchain"}                          \
          ${cross_prefix:+--cross-prefix="$cross_prefix"}                 \
          ${as:+--as="$as"}                                               \
          ${cc:+--cc="$cc"}                                               \