Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 11:07:26 +0000 (12:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 11:08:31 +0000 (12:08 +0100)
* commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6':
  tests: drop bc dependency

Conflicts:
tests/fate-run.sh

See: d47eeff2741a9ad9eb4398c1d844dd4f638d6ee4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/platform.texi
tests/fate-run.sh

@@@ -285,10 -276,10 +283,10 @@@ binutils, gcc4-core, make, git, mingw-r
  
  In order to run FATE you will also need the following "Utils" packages:
  @example
bc, diffutils
+ diffutils
  @end example
  
 -If you want to build Libav with additional libraries, download Cygwin
 +If you want to build FFmpeg with additional libraries, download Cygwin
  "Devel" packages for Ogg and Vorbis from any Cygwin packages repository:
  @example
  libogg-devel, libvorbis-devel
Simple merge