RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Hanspeter Niederstrasser 2011-12-10 19:56:48 -05:00 committed by Michael Niedermayer
parent 964912aba5
commit bed04e2b03
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doxyfile
View File

@ -859,7 +859,7 @@ HTML_DYNAMIC_SECTIONS = NO
# If the GENERATE_DOCSET tag is set to YES, additional index files # 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 # 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 # To create a documentation set, doxygen will generate a Makefile in the
# HTML output directory. Running make will produce the docset in that # HTML output directory. Running make will produce the docset in that
# directory and running "make install" will install the docset in # directory and running "make install" will install the docset in

13
doc/platform.texi
View File

@ -45,20 +45,21 @@ bash ./configure
@end example @end example
@anchor{Darwin} @anchor{Darwin}
@section Darwin (OSX, iPhone) @section Darwin (Mac OS X, iPhone)
The toolchain provided with Xcode is sufficient to build the basic The toolchain provided with Xcode is sufficient to build the basic
unacelerated code. 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 @url{http://github.com/yuvi/gas-preprocessor} to build the optimized
assembler functions. Just download the Perl script and put it somewhere assembler functions. Just download the Perl script and put it somewhere
in your PATH, FFmpeg's configure will pick it up automatically. in your PATH, FFmpeg's configure will pick it up automatically.
OSX 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 @url{http://mxcl.github.com/homebrew/, Homebrew}, optimized assembler functions. @uref{http://www.finkproject.org/, Fink},
@url{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},
or @url{http://www.macports.org, MacPorts} can easily provide it. @uref{http://mxcl.github.com/homebrew/, Homebrew}
or @uref{http://www.macports.org, MacPorts} can easily provide it.
@chapter DOS @chapter DOS

2
ffplay.c
View File

@ -2778,7 +2778,7 @@ static void toggle_full_screen(VideoState *is)
{ {
is_full_screen = !is_full_screen; is_full_screen = !is_full_screen;
#if defined(__APPLE__) && SDL_VERSION_ATLEAST(1, 2, 14) #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++) { for (int i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
is->pictq[i].reallocate = 1; is->pictq[i].reallocate = 1;
} }

2
libavutil/mem.c
View File

@ -86,7 +86,7 @@ void *av_malloc(size_t size)
ptr = (char*)ptr + diff; ptr = (char*)ptr + diff;
((char*)ptr)[-1]= diff; ((char*)ptr)[-1]= diff;
#elif HAVE_POSIX_MEMALIGN #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)) if (posix_memalign(&ptr,ALIGN,size))
ptr = NULL; ptr = NULL;
#elif HAVE_MEMALIGN #elif HAVE_MEMALIGN