X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=doc%2Fplatform.texi;h=bdfb6fd6a52cf6db5dff875c02f37eecbc284a2a;hb=14604087031d5cb93f8513a8835be67d72547b4a;hp=576c29531302e9ade2c22fc2b5513d0ab3f12ad0;hpb=40cc925f9321c3665341b5a9c209cdc810446890;p=ffmpeg diff --git a/doc/platform.texi b/doc/platform.texi index 576c2953130..bdfb6fd6a52 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -71,9 +71,9 @@ Mac OS X on PowerPC or ARM (iPhone) requires a preprocessor from assembly functions. Put the Perl script somewhere in your PATH, FFmpeg's configure will pick it up automatically. -Mac OS X on amd64 and x86 requires @command{yasm} to build most of the +Mac OS X on amd64 and x86 requires @command{nasm} to build most of the optimized assembly functions. @uref{http://www.finkproject.org/, Fink}, -@uref{http://www.gentoo.org/proj/en/gentoo-alt/prefix/bootstrap-macos.xml, Gentoo Prefix}, +@uref{https://wiki.gentoo.org/wiki/Project:Prefix, Gentoo Prefix}, @uref{https://mxcl.github.com/homebrew/, Homebrew} or @uref{http://www.macports.org, MacPorts} can easily provide it. @@ -141,7 +141,7 @@ them under @command{MinGW-w64 Win64 Shell} and @command{MinGW-w64 Win32 Shell}. pacman -S make pkgconf diffutils # mingw-w64 packages and toolchains -pacman -S mingw-w64-x86_64-yasm mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL +pacman -S mingw-w64-x86_64-nasm mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2 @end example To target 32 bits replace @code{x86_64} with @code{i686} in the command above. @@ -159,7 +159,7 @@ You will need the following prerequisites: @item @uref{http://code.google.com/p/msinttypes/, msinttypes} (if using MSVC 2012 or earlier) @item @uref{http://msys2.github.io/, MSYS2} -@item @uref{http://yasm.tortall.net/, YASM} +@item @uref{http://www.nasm.us/, NASM} (Also available via MSYS2's package manager.) @end itemize @@ -315,7 +315,7 @@ These library packages are only available from @example yasm, libSDL-devel, libgsm-devel, libmp3lame-devel, -libschroedinger1.0-devel, speex-devel, libtheora-devel, libxvidcore-devel +speex-devel, libtheora-devel, libxvidcore-devel @end example The recommendation for x264 is to build it from source, as it evolves too