diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:12:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:12:28 +0100 |
| commit | dde996bf999a2b4ec155e78a7b6b1cd66830fb9d (patch) | |
| tree | 51f135e8105fdea2389ba9aae5aa6ef0808ecf0e | |
| parent | cad2958fd7ca3f4aef88170f87652b165088b3e6 (diff) | |
| parent | 0f42e06651c9c4d7581b70b9ad2b160c2525094f (diff) | |
| download | ffmpeg-dde996bf999a2b4ec155e78a7b6b1cd66830fb9d.tar.gz | |
Merge commit '0f42e06651c9c4d7581b70b9ad2b160c2525094f' into release/2.2
* commit '0f42e06651c9c4d7581b70b9ad2b160c2525094f':
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 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 |