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>

diff --cc doc/platform.texi
index 934a3ae,45ec275..f5bfd25
--- 1/doc/platform.texi
--- 2/doc/platform.texi
+++ b/doc/platform.texi
@@@ -50,16 -50,15 +50,17 @@@ bash ./configur
  The toolchain provided with Xcode is sufficient to build the basic
  unacelerated code.
  
 -OS X on PowerPC or ARM (iPhone) requires a preprocessor from
 -@url{git://git.libav.org/gas-preprocessor.git} to build the optimized
 +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, Libav's configure will pick it up automatically.
 +in your PATH, FFmpeg's configure will pick it up automatically.
  
 -OS X on AMD64 and x86 requires @command{yasm} to build most of the
 -optimized assembler functions @url{http://mxcl.github.com/homebrew/, Homebrew},
 -@url{http://www.gentoo.org/proj/en/gentoo-alt/prefix/bootstrap-macos.xml, Gentoo Prefix}
 -or @url{http://www.macports.org, MacPorts} can easily provide it.
 +Mac OS X on amd64 and x86 requires @command{yasm} to build most of the
 +optimized assembler functions. @uref{http://www.finkproject.org/, Fink},
 +@uref{http://www.gentoo.org/proj/en/gentoo-alt/prefix/bootstrap-macos.xml, Gentoo Prefix},
 +@uref{http://mxcl.github.com/homebrew/, Homebrew}
 +or @uref{http://www.macports.org, MacPorts} can easily provide it.
  
  
  @chapter DOS