Commit 9b41bf5c authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a982c5d7'

* commit 'a982c5d7':
  tests: drop bc dependency

Conflicts:
	tests/fate-run.sh

See: d47eeff2Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4b55a7e1 a982c5d7
...@@ -137,8 +137,6 @@ You will need the following prerequisites: ...@@ -137,8 +137,6 @@ You will need the following prerequisites:
@item @uref{http://msys2.github.io/, MSYS2} @item @uref{http://msys2.github.io/, MSYS2}
@item @uref{http://yasm.tortall.net/, YASM} @item @uref{http://yasm.tortall.net/, YASM}
(Also available via MSYS2's package manager.) (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 @end itemize
To set up a proper environment in MSYS2, you need to run @code{msys_shell.bat} from 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 ...@@ -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: In order to run FATE you will also need the following "Utils" packages:
@example @example
bc, diffutils diffutils
@end example @end example
If you want to build FFmpeg with additional libraries, download Cygwin If you want to build FFmpeg with additional libraries, download Cygwin
......
...@@ -38,7 +38,7 @@ target_path(){ ...@@ -38,7 +38,7 @@ target_path(){
# $1=value1, $2=value2, $3=threshold # $1=value1, $2=value2, $3=threshold
# prints 0 if absolute difference between value1 and value2 is <= threshold # prints 0 if absolute difference between value1 and value2 is <= threshold
compare(){ 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(){ do_tiny_psnr(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment