ffmpeg | branch: release/2.4 | Clément Bœsch <u...@pkh.me> | Mon Jan 19
22:56:59 2015 +0100| [07256a7a6ec8a6a5bf6190cd85f3d60141376279] | committer:
Michael Niedermayer
tests: drop bc dependency
We already have a dependency on awk and bc is sometimes not found in the
base system.
Signed-off-by: Martin Storsjö <mar...@martin.st>
(cherry picked from commit a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6)
Signed-off-by: Timothy Gu <timothyg...@gmail.com>
Conflicts:
doc/platform.texi
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07256a7a6ec8a6a5bf6190cd85f3d60141376279
---
doc/platform.texi | 4 +---
tests/fate-run.sh | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/doc/platform.texi b/doc/platform.texi
index ca76492..fa91ce2 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -135,8 +135,6 @@ You will need the following prerequisites:
(if using MSVC 2012 or earlier)
@item @uref{http://www.mingw.org/, MSYS}
@item @uref{http://yasm.tortall.net/, YASM}
-@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 MSYS, you need to run @code{msys.bat} from
@@ -283,7 +281,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 6e3373a..e3b1b5e 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(){
- echo "scale=2; v = $1 - $2; if (v < 0) v = -v; if (v > $3) r = 1; r" | bc
+ awk "BEGIN { v = $1 - $2; printf ((v < 0 ? -v : v) > $3) }"
}
do_tiny_psnr(){
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
