aboutsummaryrefslogtreecommitdiffstats
path: root/doc/platform.texi
diff options
context:
space:
mode:
authorHanspeter Niederstrasser <niederstrasser@gmail.com>2011-12-10 19:56:48 -0500
committerMichael Niedermayer <michaelni@gmx.at>2011-12-11 03:00:30 +0100
commitbed04e2b0396a83114d37eec9c7e78d0ffccf1dc (patch)
treec2fb02c116b4f66f113391ef57f7b7bffd849017 /doc/platform.texi
parent964912aba56a29acf25c9e216255ea44190f419a (diff)
downloadffmpeg-bed04e2b0396a83114d37eec9c7e78d0ffccf1dc.tar.gz
Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS X
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/platform.texi')
-rw-r--r--doc/platform.texi13
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/platform.texi b/doc/platform.texi
index d15c5749a9..d2084bb023 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -45,20 +45,21 @@ bash ./configure
@end example
@anchor{Darwin}
-@section Darwin (OSX, iPhone)
+@section Darwin (Mac OS X, iPhone)
The toolchain provided with Xcode is sufficient to build the basic
unacelerated code.
-OSX on PowerPC or ARM (iPhone) requires a preprocessor from
+Mac OS X on PowerPC or ARM (iPhone) requires a preprocessor from
@url{http://github.com/yuvi/gas-preprocessor} to build the optimized
assembler functions. Just download the Perl script and put it somewhere
in your PATH, FFmpeg's configure will pick it up automatically.
-OSX on amd64 and x86 requires @command{yasm} to build most of the
-optimized assembler functions @url{http://mxcl.github.com/homebrew/, Homebrew},
-@url{http://www.gentoo.org/proj/en/gentoo-alt/prefix/bootstrap-macos.xml, Gentoo Prefix}
-or @url{http://www.macports.org, MacPorts} can easily provide it.
+Mac OS X on amd64 and x86 requires @command{yasm} to build most of the
+optimized assembler functions. @uref{http://www.finkproject.org/, Fink},
+@uref{http://www.gentoo.org/proj/en/gentoo-alt/prefix/bootstrap-macos.xml, Gentoo Prefix},
+@uref{http://mxcl.github.com/homebrew/, Homebrew}
+or @uref{http://www.macports.org, MacPorts} can easily provide it.
@chapter DOS