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

Change SYS_DARWIN preprocessor checks to __APPLE__, they are specific

Browse Source 
to Mac OS X rather than to Darwin.

Originally committed as revision 10247 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-08-27 09:17:03 +00:00
parent d664a6255b
commit c97f54020d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffplay.c
View File

@ -865,7 +865,7 @@ static int video_open(VideoState *is){
w = 640; w = 640;
h = 480; h = 480;
} }
#ifndef SYS_DARWIN #ifndef __APPLE__
screen = SDL_SetVideoMode(w, h, 0, flags); screen = SDL_SetVideoMode(w, h, 0, flags);
#else #else
/* setting bits_per_pixel = 0 or 32 causes blank video on OS X */ /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */
@ -2520,8 +2520,8 @@ int main(int argc, char **argv)
video_disable = 1; video_disable = 1;
} }
flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER; flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
#if !defined(__MINGW32__) && !defined(SYS_DARWIN) #if !defined(__MINGW32__) && !defined(__APPLE__)
flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 or darwin */ flags |= SDL_INIT_EVENTTHREAD; /* Not supported on Windows or Mac OS X */
#endif #endif
if (SDL_Init (flags)) { if (SDL_Init (flags)) {
fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError()); fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError());

12
libavcodec/ppc/dsputil_altivec.c
View File

@ -26,7 +26,7 @@
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
#ifdef SYS_DARWIN #ifdef __APPLE__
#include <sys/sysctl.h> #include <sys/sysctl.h>
#elif __AMIGAOS4__ #elif __AMIGAOS4__
#include <exec/exec.h> #include <exec/exec.h>
@ -49,7 +49,7 @@ static void sigill_handler (int sig)
canjump = 0; canjump = 0;
siglongjmp (jmpbuf, 1); siglongjmp (jmpbuf, 1);
} }
#endif /* SYS_DARWIN */ #endif /* __APPLE__ */
int sad16_x2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) int sad16_x2_altivec(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h)
{ {
@ -1428,7 +1428,7 @@ int has_altivec(void)
return 0; return 0;
#else /* __AMIGAOS4__ */ #else /* __AMIGAOS4__ */
#ifdef SYS_DARWIN #ifdef __APPLE__
int sels[2] = {CTL_HW, HW_VECTORUNIT}; int sels[2] = {CTL_HW, HW_VECTORUNIT};
int has_vu = 0; int has_vu = 0;
size_t len = sizeof(has_vu); size_t len = sizeof(has_vu);
@ -1437,8 +1437,8 @@ int has_altivec(void)
err = sysctl(sels, 2, &has_vu, &len, NULL, 0); err = sysctl(sels, 2, &has_vu, &len, NULL, 0);
if (err == 0) return (has_vu != 0); if (err == 0) return (has_vu != 0);
#else /* SYS_DARWIN */ #else /* __APPLE__ */
/* no Darwin, do it the brute-force way */ /* no Mac OS X, do it the brute-force way */
/* this is borrowed from the libmpeg2 library */ /* this is borrowed from the libmpeg2 library */
{ {
signal (SIGILL, sigill_handler); signal (SIGILL, sigill_handler);
@ -1456,7 +1456,7 @@ int has_altivec(void)
return 1; return 1;
} }
} }
#endif /* SYS_DARWIN */ #endif /* __APPLE__ */
return 0; return 0;
#endif /* __AMIGAOS4__ */ #endif /* __AMIGAOS4__ */
} }

2
libavutil/internal.h
View File

@ -128,7 +128,7 @@
#else #else
# if defined(ARCH_X86_64) && defined(PIC) # if defined(ARCH_X86_64) && defined(PIC)
# define MANGLE(a) #a"(%%rip)" # define MANGLE(a) #a"(%%rip)"
# elif defined(SYS_DARWIN) # elif defined(__APPLE__)
# define MANGLE(a) "_" #a # define MANGLE(a) "_" #a
# else # else
# define MANGLE(a) #a # define MANGLE(a) #a