diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:03:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:03:19 +0200 |
| commit | 53dcd772aa1f53706f1fa96350a47b90d5c4fe7d (patch) | |
| tree | 4b702a5c70e77e034d232350fadcf9c7faf7db89 | |
| parent | 2f894deeda18bf9162d7ceb96fa83253e331a37e (diff) | |
| parent | f1a8885ae9e7f281b597d1f9188fc16fb2ab7832 (diff) | |
| download | ffmpeg-53dcd772aa1f53706f1fa96350a47b90d5c4fe7d.tar.gz | |
Merge commit 'f1a8885ae9e7f281b597d1f9188fc16fb2ab7832' into release/0.10
* commit 'f1a8885ae9e7f281b597d1f9188fc16fb2ab7832':
doc: Point to the correct, actually maintained gas-preprocessor repo
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/platform.texi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/platform.texi b/doc/platform.texi index b52e13a94d..9de280933a 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -51,8 +51,9 @@ The toolchain provided with Xcode is sufficient to build the basic unacelerated code. Mac OS X on PowerPC or ARM (iPhone) requires a preprocessor from +@url{https://github.com/FFmpeg/gas-preprocessor} or @url{http://github.com/yuvi/gas-preprocessor} to build the optimized -assembler functions. Just download the Perl script and put it somewhere +assembler 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 |