diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:30:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:30:35 +0200 |
| commit | a125f87ac49b18c57a0bedb6ce44329a4aa70cef (patch) | |
| tree | b6d1ad90d60944ce6d6588b0259b33b63ec627b6 /configure | |
| parent | 49f1b869b60f27ac450f3db301b46d56e5d5aca6 (diff) | |
| parent | 463a7cde563fd805864c48a76dd1b03fc24671ed (diff) | |
| download | ffmpeg-a125f87ac49b18c57a0bedb6ce44329a4aa70cef.tar.gz | |
Merge commit '463a7cde563fd805864c48a76dd1b03fc24671ed'
* commit '463a7cde563fd805864c48a76dd1b03fc24671ed':
Differentiate assembler and assembly in documentation and comments
Conflicts:
configure
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 4 insertions, 4 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 |