diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:30:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:30:35 +0200 |
| commit | a125f87ac49b18c57a0bedb6ce44329a4aa70cef (patch) | |
| tree | b6d1ad90d60944ce6d6588b0259b33b63ec627b6 /doc/platform.texi | |
| parent | 49f1b869b60f27ac450f3db301b46d56e5d5aca6 (diff) | |
| parent | 463a7cde563fd805864c48a76dd1b03fc24671ed (diff) | |
| download | ffmpeg-a125f87ac49b18c57a0bedb6ce44329a4aa70cef.tar.gz | |
Merge commit '463a7cde563fd805864c48a76dd1b03fc24671ed'
* commit '463a7cde563fd805864c48a76dd1b03fc24671ed':
Differentiate assembler and assembly in documentation and comments
Conflicts:
configure
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/platform.texi')
| -rw-r--r-- | doc/platform.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/platform.texi b/doc/platform.texi index c999383acb..86dab54091 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -53,11 +53,11 @@ unacelerated code. Mac OS X on PowerPC or ARM (iPhone) requires a preprocessor from @url{https://github.com/FFmpeg/gas-preprocessor} or @url{https://github.com/yuvi/gas-preprocessor}(currently outdated) to build the optimized -assembler functions. Put the Perl script somewhere +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 -optimized assembler functions. @uref{http://www.finkproject.org/, Fink}, +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://mxcl.github.com/homebrew/, Homebrew} or @uref{http://www.macports.org, MacPorts} can easily provide it. |