summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure8
-rw-r--r--doc/platform.texi4
2 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure
index fa1109d697..db7044db32 100755
--- a/configure
+++ b/configure
@@ -263,7 +263,7 @@ Advanced options (experts only):
--enable-sram allow use of on-chip SRAM
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
@@ -285,8 +285,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
Developer options (useful when working on Libav itself):
--disable-debug disable debugging symbols
@@ -4341,7 +4341,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 45ec2754d9..356ee2f747 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -52,11 +52,11 @@ 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
-assembler functions. Put the Perl script somewhere
+assembly functions. Put the Perl script somewhere
in your PATH, Libav'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},
+optimized assembly 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.