diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 12:07:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 12:08:31 +0100 |
| commit | 9b41bf5c3dcefb95c8329e699f4bdb71ad267e6f (patch) | |
| tree | ccf30085a7d77d1000f201b6b4d4be58a1a038d6 | |
| parent | 4b55a7e1ce686c786825b2b3e3b5115b5bf55ffa (diff) | |
| parent | a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6 (diff) | |
| download | ffmpeg-9b41bf5c3dcefb95c8329e699f4bdb71ad267e6f.tar.gz | |
Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'
* commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6':
tests: drop bc dependency
Conflicts:
tests/fate-run.sh
See: d47eeff2741a9ad9eb4398c1d844dd4f638d6ee4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/platform.texi | 4 | ||||
| -rwxr-xr-x | tests/fate-run.sh | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/doc/platform.texi b/doc/platform.texi index 73b73fb490..705a68006f 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -137,8 +137,6 @@ You will need the following prerequisites: @item @uref{http://msys2.github.io/, MSYS2} @item @uref{http://yasm.tortall.net/, YASM} (Also available via MSYS2's package manager.) -@item @uref{http://gnuwin32.sourceforge.net/packages/bc.htm, bc for Windows} if -you want to run @uref{fate.html, FATE}. @end itemize To set up a proper environment in MSYS2, you need to run @code{msys_shell.bat} from @@ -285,7 +283,7 @@ binutils, gcc4-core, make, git, mingw-runtime, texinfo In order to run FATE you will also need the following "Utils" packages: @example -bc, diffutils +diffutils @end example If you want to build FFmpeg with additional libraries, download Cygwin diff --git a/tests/fate-run.sh b/tests/fate-run.sh index c7b2922799..824d5f48d1 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -38,7 +38,7 @@ target_path(){ # $1=value1, $2=value2, $3=threshold # prints 0 if absolute difference between value1 and value2 is <= threshold compare(){ - awk "BEGIN { v=$1-$2; printf ((v<0?-v:v) > $3) }" + awk "BEGIN { v = $1 - $2; printf ((v < 0 ? -v : v) > $3) }" } do_tiny_psnr(){ |