diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 23:02:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 23:02:56 +0100 |
| commit | 835f41376da1250a68a7d8c90fe3dc4049051fad (patch) | |
| tree | a1217b0e3ce89218d870df213ce6fe362a10822d /doc/platform.texi | |
| parent | e5920425b02b0feaf45971bf1c8b8abc541f5ae1 (diff) | |
| parent | d15c536123a44362ace6299c391a492c90b83fc7 (diff) | |
| download | ffmpeg-835f41376da1250a68a7d8c90fe3dc4049051fad.tar.gz | |
Merge commit 'd15c536123a44362ace6299c391a492c90b83fc7'
* commit 'd15c536123a44362ace6299c391a492c90b83fc7':
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/platform.texi')
| -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 934a3ae317..f5bfd256c7 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 |