falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Rename CONFIG_DARWIN to SYS_DARWIN, it is not configurable (in FFmpeg). 

Originally committed as revision 10190 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Diego Biurrun 18 years ago
parent
e241ba148f
commit
9d16f87ffd
9 changed files with 16 additions and 16 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      configure
  2. +2
    -2
      ffplay.c
  3. +1
    -1
      libavcodec/dsputil.h
  4. +5
    -5
      libavcodec/ppc/dsputil_altivec.c
  5. +2
    -2
      libavcodec/ppc/dsputil_altivec.h
  6. +2
    -2
      libavcodec/ppc/gcc_fixes.h
  7. +1
    -1
      libavcodec/ppc/mpegvideo_altivec.c
  8. +1
    -1
      libavutil/internal.h
  9. +1
    -1
      libpostproc/postprocess_altivec_template.c

+ 1
- 1
configure View File

@@ -1975,7 +1975,7 @@ print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \
$PROTOCOL_LIST \ $PROTOCOL_LIST \


if test "$targetos" = darwin; then if test "$targetos" = darwin; then
echo "#define CONFIG_DARWIN 1" >> $TMPH
echo "#define SYS_DARWIN 1" >> $TMPH
fi fi


echo "#define restrict $_restrict" >> $TMPH echo "#define restrict $_restrict" >> $TMPH


+ 2
- 2
ffplay.c View File

@@ -865,7 +865,7 @@ static int video_open(VideoState *is){
w = 640; w = 640;
h = 480; h = 480;
} }
#ifndef CONFIG_DARWIN
#ifndef SYS_DARWIN
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 */
@@ -2541,7 +2541,7 @@ 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(CONFIG_DARWIN)
#if !defined(__MINGW32__) && !defined(SYS_DARWIN)
flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 or darwin */ flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 or darwin */
#endif #endif
if (SDL_Init (flags)) { if (SDL_Init (flags)) {


+ 1
- 1
libavcodec/dsputil.h View File

@@ -554,7 +554,7 @@ extern int mm_flags;


extern int mm_flags; extern int mm_flags;


#if defined(HAVE_ALTIVEC) && !defined(CONFIG_DARWIN)
#if defined(HAVE_ALTIVEC) && !defined(SYS_DARWIN)
#define pixel altivec_pixel #define pixel altivec_pixel
#include <altivec.h> #include <altivec.h>
#undef pixel #undef pixel


+ 5
- 5
libavcodec/ppc/dsputil_altivec.c View File

@@ -26,7 +26,7 @@


#include "dsputil_altivec.h" #include "dsputil_altivec.h"


#ifdef CONFIG_DARWIN
#ifdef SYS_DARWIN
#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 /* CONFIG_DARWIN */
#endif /* SYS_DARWIN */


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 CONFIG_DARWIN
#ifdef SYS_DARWIN
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,7 +1437,7 @@ 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 /* CONFIG_DARWIN */
#else /* SYS_DARWIN */
/* no Darwin, do it the brute-force way */ /* no Darwin, do it the brute-force way */
/* this is borrowed from the libmpeg2 library */ /* this is borrowed from the libmpeg2 library */
{ {
@@ -1456,7 +1456,7 @@ int has_altivec(void)
return 1; return 1;
} }
} }
#endif /* CONFIG_DARWIN */
#endif /* SYS_DARWIN */
return 0; return 0;
#endif /* __AMIGAOS4__ */ #endif /* __AMIGAOS4__ */
} }


+ 2
- 2
libavcodec/ppc/dsputil_altivec.h View File

@@ -44,7 +44,7 @@ void avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size,
#define WORD_s2 0x18,0x19,0x1a,0x1b #define WORD_s2 0x18,0x19,0x1a,0x1b
#define WORD_s3 0x1c,0x1d,0x1e,0x1f #define WORD_s3 0x1c,0x1d,0x1e,0x1f


#ifdef CONFIG_DARWIN
#ifdef SYS_DARWIN
#define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d) #define vcprm(a,b,c,d) (const vector unsigned char)(WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d)
#else #else
#define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d} #define vcprm(a,b,c,d) (const vector unsigned char){WORD_ ## a, WORD_ ## b, WORD_ ## c, WORD_ ## d}
@@ -61,7 +61,7 @@ void avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size,
#define FLOAT_p 1. #define FLOAT_p 1.




#ifdef CONFIG_DARWIN
#ifdef SYS_DARWIN
#define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d) #define vcii(a,b,c,d) (const vector float)(FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d)
#else #else
#define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d} #define vcii(a,b,c,d) (const vector float){FLOAT_ ## a, FLOAT_ ## b, FLOAT_ ## c, FLOAT_ ## d}


+ 2
- 2
libavcodec/ppc/gcc_fixes.h View File

@@ -27,7 +27,7 @@
#include <altivec.h> #include <altivec.h>
#endif #endif


#ifdef CONFIG_DARWIN
#ifdef SYS_DARWIN
# ifndef __MWERKS__ # ifndef __MWERKS__
# define AVV(x...) (x) # define AVV(x...) (x)
# else # else
@@ -108,7 +108,7 @@ __ch (__bin_args_eq (vector unsigned int, (a1), vector unsigned int, (a2)), \


#endif #endif


#endif /* CONFIG_DARWIN */
#endif /* SYS_DARWIN */


#ifndef __MWERKS__ #ifndef __MWERKS__
#define const_vector const vector #define const_vector const vector


+ 1
- 1
libavcodec/ppc/mpegvideo_altivec.c View File

@@ -66,7 +66,7 @@ do { \
} }




#ifdef CONFIG_DARWIN
#ifdef SYS_DARWIN
#define FOUROF(a) (a) #define FOUROF(a) (a)
#else #else
// slower, for dumb non-apple GCC // slower, for dumb non-apple GCC


+ 1
- 1
libavutil/internal.h View File

@@ -121,7 +121,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(CONFIG_DARWIN)
# elif defined(SYS_DARWIN)
# define MANGLE(a) "_" #a # define MANGLE(a) "_" #a
# else # else
# define MANGLE(a) #a # define MANGLE(a) #a


+ 1
- 1
libpostproc/postprocess_altivec_template.c View File

@@ -22,7 +22,7 @@


#include "avutil.h" #include "avutil.h"


#ifdef CONFIG_DARWIN
#ifdef SYS_DARWIN
#define AVV(x...) (x) #define AVV(x...) (x)
#else #else
#define AVV(x...) {x} #define AVV(x...) {x}


Write Preview
Loading…
Cancel
Save