diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:20:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:20:35 +0200 |
| commit | ed9ab30f4cca55f0306fb91ad79562f1de4d3bb7 (patch) | |
| tree | 6f87f79b763f57e79bf5b47d1976a0ff2720df8d /doc | |
| parent | 1fabe4ae8cc07d80c735bb45858f542bb0aea944 (diff) | |
| parent | d791e8c990a752435d993df01516ebe469d94535 (diff) | |
| download | ffmpeg-ed9ab30f4cca55f0306fb91ad79562f1de4d3bb7.tar.gz | |
Merge commit 'd791e8c990a752435d993df01516ebe469d94535' into release/1.1
* commit 'd791e8c990a752435d993df01516ebe469d94535':
doc: Point to the correct, actually maintained gas-preprocessor repo
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -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 bb8e6ca5ca..39af15a5d6 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 |