summaryrefslogtreecommitdiff
path: root/doc/general.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi13
1 files changed, 11 insertions, 2 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 120b7160c2..04ca71db91 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -840,13 +840,22 @@ bash directly to work around this:
bash ./configure
@end example
-@subsection Darwin (MacOS X, iPhone)
+@anchor{Darwin}
+@subsection Darwin (OSX, iPhone)
-MacOS X on PowerPC or ARM (iPhone) requires a preprocessor from
+The toolchain provided with Xcode is sufficient to build the basic
+unacelerated code.
+
+OSX 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.
+
@section Windows
To get help and instructions for building FFmpeg under Windows, check out