virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '463a7cde563fd805864c48a76dd1b03fc24671ed'

Browse Source 
* commit '463a7cde563fd805864c48a76dd1b03fc24671ed':
  Differentiate assembler and assembly in documentation and comments

Conflicts:
	configure
	doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-06-23 01:30:35 +02:00
parent 49f1b869b6 463a7cde56
commit a125f87ac4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@@ -316,7 +316,7 @@ Advanced options (experts only):
--sws-max-filter-size=N the max filter size swscale uses [$sws_max_filter_size_default] --sws-max-filter-size=N the max filter size swscale uses [$sws_max_filter_size_default]
Optimization options (experts only): Optimization options (experts only):
--disable-asm disable all assembler optimizations --disable-asm disable all assembly optimizations
--disable-altivec disable AltiVec optimizations --disable-altivec disable AltiVec optimizations
--disable-amd3dnow disable 3DNow! optimizations --disable-amd3dnow disable 3DNow! optimizations
--disable-amd3dnowext disable 3DNow! extended optimizations --disable-amd3dnowext disable 3DNow! extended optimizations
@@ -338,8 +338,8 @@ Optimization options (experts only):
--disable-armv6t2 disable armv6t2 optimizations --disable-armv6t2 disable armv6t2 optimizations
--disable-vfp disable VFP optimizations --disable-vfp disable VFP optimizations
--disable-neon disable NEON optimizations --disable-neon disable NEON optimizations
--disable-inline-asm disable use of inline assembler --disable-inline-asm disable use of inline assembly
--disable-yasm disable use of yasm assembler --disable-yasm disable use of nasm/yasm assembly
--disable-mips32r2 disable MIPS32R2 optimizations --disable-mips32r2 disable MIPS32R2 optimizations
--disable-mipsdspr1 disable MIPS DSP ASE R1 optimizations --disable-mipsdspr1 disable MIPS DSP ASE R1 optimizations
--disable-mipsdspr2 disable MIPS DSP ASE R2 optimizations --disable-mipsdspr2 disable MIPS DSP ASE R2 optimizations
@@ -5064,7 +5064,7 @@ elif enabled cparser; then
elif enabled armcc; then elif enabled armcc; then
add_cflags -W${armcc_opt},--diag_suppress=4343 # hardfp compat add_cflags -W${armcc_opt},--diag_suppress=4343 # hardfp compat
add_cflags -W${armcc_opt},--diag_suppress=3036 # using . as system include dir 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=2523
add_cflags -W${armcc_opt},--diag_suppress=1207 add_cflags -W${armcc_opt},--diag_suppress=1207
add_cflags -W${armcc_opt},--diag_suppress=1293 # assignment in condition add_cflags -W${armcc_opt},--diag_suppress=1293 # assignment in condition

4
doc/platform.texi
View File

@@ -53,11 +53,11 @@ unacelerated code.
Mac OS X on PowerPC or ARM (iPhone) requires a preprocessor from Mac OS X on PowerPC or ARM (iPhone) requires a preprocessor from
@url{https://github.com/FFmpeg/gas-preprocessor} or @url{https://github.com/FFmpeg/gas-preprocessor} or
@url{https://github.com/yuvi/gas-preprocessor}(currently outdated) to build the optimized @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. 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 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{http://www.gentoo.org/proj/en/gentoo-alt/prefix/bootstrap-macos.xml, Gentoo Prefix},
@uref{https://mxcl.github.com/homebrew/, Homebrew} @uref{https://mxcl.github.com/homebrew/, Homebrew}
or @uref{http://www.macports.org, MacPorts} can easily provide it. or @uref{http://www.macports.org, MacPorts} can easily provide it.