Browse Source

Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'

* commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6':
  tests: drop bc dependency

Conflicts:
	tests/fate-run.sh

See: d47eeff274
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.6
Michael Niedermayer 10 years ago
parent
commit
9b41bf5c3d
2 changed files with 2 additions and 4 deletions
  1. +1
    -3
      doc/platform.texi
  2. +1
    -1
      tests/fate-run.sh

+ 1
- 3
doc/platform.texi View File

@@ -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


+ 1
- 1
tests/fate-run.sh View File

@@ -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(){


Loading…
Cancel
Save