[FFmpeg-cvslog] Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS X

[Hanspeter Niederstrasser]

ffmpeg | branch: master | Hanspeter Niederstrasser <niederstrasser at gmail.com> | Sat Dec 10 19:56:48 2011 -0500| [bed04e2b0396a83114d37eec9c7e78d0ffccf1dc] | committer: Michael Niedermayer

Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS X

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bed04e2b0396a83114d37eec9c7e78d0ffccf1dc
---

 Doxyfile          |    2 +-
 doc/platform.texi |   13 +++++++------
 ffplay.c          |    2 +-
 libavutil/mem.c   |    2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index 5640de8..91907ae 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -859,7 +859,7 @@ HTML_DYNAMIC_SECTIONS  = NO
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files
 # will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
+# integrated development environment, introduced with OS X 10.5 (Leopard).
 # To create a documentation set, doxygen will generate a Makefile in the
 # HTML output directory. Running make will produce the docset in that
 # directory and running "make install" will install the docset in
diff --git a/doc/platform.texi b/doc/platform.texi
index d15c574..d2084bb 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -45,20 +45,21 @@ bash ./configure
 @end example
 
 @anchor{Darwin}
- at section Darwin (OSX, iPhone)
+ at section Darwin (Mac OS X, iPhone)
 
 The toolchain provided with Xcode is sufficient to build the basic
 unacelerated code.
 
-OSX on PowerPC or ARM (iPhone) requires a preprocessor from
+Mac OS X on PowerPC or ARM (iPhone) requires a preprocessor from
 @url{http://github.com/yuvi/gas-preprocessor} to build the optimized
 assembler functions. Just download the Perl script and put it somewhere
 in your PATH, FFmpeg's configure will pick it up automatically.
 
-OSX on amd64 and x86 requires @command{yasm} to build most of the
-optimized assembler functions @url{http://mxcl.github.com/homebrew/, Homebrew},
- at 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},
+ at uref{http://www.gentoo.org/proj/en/gentoo-alt/prefix/bootstrap-macos.xml, Gentoo Prefix},
+ at uref{http://mxcl.github.com/homebrew/, Homebrew}
+or @uref{http://www.macports.org, MacPorts} can easily provide it.
 
 
 @chapter DOS
diff --git a/ffplay.c b/ffplay.c
index 976ac06..7ebe6f3 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2778,7 +2778,7 @@ static void toggle_full_screen(VideoState *is)
 {
     is_full_screen = !is_full_screen;
 #if defined(__APPLE__) && SDL_VERSION_ATLEAST(1, 2, 14)
-    /* OSX needs to reallocate the SDL overlays */
+    /* OS X needs to reallocate the SDL overlays */
     for (int i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
         is->pictq[i].reallocate = 1;
     }
diff --git a/libavutil/mem.c b/libavutil/mem.c
index a53676c..4acc43b 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -86,7 +86,7 @@ void *av_malloc(size_t size)
     ptr = (char*)ptr + diff;
     ((char*)ptr)[-1]= diff;
 #elif HAVE_POSIX_MEMALIGN
-    if (size) //OSX on SDK 10.6 has a broken posix_memalign implementation
+    if (size) //OS X on SDK 10.6 has a broken posix_memalign implementation
     if (posix_memalign(&ptr,ALIGN,size))
         ptr = NULL;
 #elif HAVE_MEMALIGN