virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'

Browse Source 
* commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6':
  tests: drop bc dependency

Conflicts:
	tests/fate-run.sh

See: d47eeff274
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-21 12:07:26 +01:00
parent 4b55a7e1ce a982c5d74f
commit 9b41bf5c3d
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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://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
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