diff options
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | doc/platform.texi | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -316,7 +316,7 @@ Advanced options (experts only): --sws-max-filter-size=N the max filter size swscale uses [$sws_max_filter_size_default] Optimization options (experts only): - --disable-asm disable all assembler optimizations + --disable-asm disable all assembly optimizations --disable-altivec disable AltiVec optimizations --disable-amd3dnow disable 3DNow! optimizations --disable-amd3dnowext disable 3DNow! extended optimizations @@ -338,8 +338,8 @@ Optimization options (experts only): --disable-armv6t2 disable armv6t2 optimizations --disable-vfp disable VFP optimizations --disable-neon disable NEON optimizations - --disable-inline-asm disable use of inline assembler - --disable-yasm disable use of yasm assembler + --disable-inline-asm disable use of inline assembly + --disable-yasm disable use of nasm/yasm assembly --disable-mips32r2 disable MIPS32R2 optimizations --disable-mipsdspr1 disable MIPS DSP ASE R1 optimizations --disable-mipsdspr2 disable MIPS DSP ASE R2 optimizations @@ -5064,7 +5064,7 @@ elif enabled cparser; then elif enabled armcc; then add_cflags -W${armcc_opt},--diag_suppress=4343 # hardfp compat add_cflags -W${armcc_opt},--diag_suppress=3036 # using . as system include dir - # 2523: use of inline assembler is deprecated + # 2523: use of inline assembly is deprecated add_cflags -W${armcc_opt},--diag_suppress=2523 add_cflags -W${armcc_opt},--diag_suppress=1207 add_cflags -W${armcc_opt},--diag_suppress=1293 # assignment in condition diff --git a/doc/platform.texi b/doc/platform.texi index c999383acb..86dab54091 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -53,11 +53,11 @@ unacelerated code. Mac OS X on PowerPC or ARM (iPhone) requires a preprocessor from @url{https://github.com/FFmpeg/gas-preprocessor} or @url{https://github.com/yuvi/gas-preprocessor}(currently outdated) to build the optimized -assembler functions. Put the Perl script somewhere +assembly 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 -optimized assembler functions. @uref{http://www.finkproject.org/, Fink}, +optimized assembly functions. @uref{http://www.finkproject.org/, Fink}, @uref{http://www.gentoo.org/proj/en/gentoo-alt/prefix/bootstrap-macos.xml, Gentoo Prefix}, @uref{https://mxcl.github.com/homebrew/, Homebrew} or @uref{http://www.macports.org, MacPorts} can easily provide it. |