On 19/01/15 3:51 PM, Derek Buitenhuis wrote: > It's better to steer users at these, since they are both better > and more alive than the mingw.org versions. > > Signed-off-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > --- > doc/platform.texi | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/doc/platform.texi b/doc/platform.texi > index ca76492..6af2a72 100644 > --- a/doc/platform.texi > +++ b/doc/platform.texi > @@ -96,9 +96,9 @@ the FFmpeg Windows Help Forum at > @url{http://ffmpeg.zeranoe.com/forum/}. > > @section Native Windows compilation using MinGW or MinGW-w64 > > -FFmpeg can be built to run natively on Windows using the MinGW or MinGW-w64 > -toolchains. Install the latest versions of MSYS and MinGW or MinGW-w64 from > -@url{http://www.mingw.org/} or @url{http://mingw-w64.sourceforge.net/}. > +FFmpeg can be built to run natively on Windows using the MinGW-w64 > +toolchain. Install the latest versions of MSYS2 and MinGW-w64 from > +@url{http://msys2.github.io/} and/or @url{http://mingw-w64.sourceforge.net/}. > You can find detailed installation instructions in the download section and > the FAQ. > > @@ -106,7 +106,7 @@ Notes: > > @itemize > > -@item Building natively using MSYS can be sped up by disabling implicit rules > +@item Building natively using MSYS2 can be sped up by disabling implicit > rules > in the Makefile by calling @code{make -r} instead of plain @code{make}. This > speed up is close to non-existent for normal one-off builds and is only > noticeable when running make for a second time (for example during > @@ -133,13 +133,13 @@ You will need the following prerequisites: > (if using MSVC 2012 or earlier) > @item @uref{http://code.google.com/p/msinttypes/, msinttypes} > (if using MSVC 2012 or earlier) > -@item @uref{http://www.mingw.org/, MSYS} > +@item @uref{http://msys2.github.io/, MSYS2} > @item @uref{http://yasm.tortall.net/, YASM}
Yasm/Nasm are both available from MSYS2's package manager, so maybe add comment about it being needed for msvc/icl only. > @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 > +To set up a proper environment in MSYS2, you need to run @code{msys.bat} from msys2_shell.bat, assuming this is for msvc/icl and not mingw. > the Visual Studio or Intel Compiler command prompt. > > Place @code{yasm.exe} somewhere in your @code{PATH}. If using MSVC 2012 or > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel