diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 (patch) | |
tree | a838e509fdc2468220466e6337097b3ef590b00c /libmpeg2 | |
parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e (diff) | |
parent | 5b3834c5d1033f05d798278c33782c5563247062 (diff) |
Merge svn changes up to r26979
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
Diffstat (limited to 'libmpeg2')
-rw-r--r-- | libmpeg2/idct_altivec.c | 6 | ||||
-rw-r--r-- | libmpeg2/libmpeg-0.4.1.diff | 14 |
2 files changed, 3 insertions, 17 deletions
diff --git a/libmpeg2/idct_altivec.c b/libmpeg2/idct_altivec.c index 303cfe8662..381ef069f0 100644 --- a/libmpeg2/idct_altivec.c +++ b/libmpeg2/idct_altivec.c @@ -56,10 +56,10 @@ static inline vector_s16_t my_vec_mergel (vector_s16_t const A, #define vec_mergel my_vec_mergel #endif -#if defined(__APPLE_CC__) /* apple */ -#define VEC_S16(a,b,c,d,e,f,g,h) (vector_s16_t) (a, b, c, d, e, f, g, h) -#else /* gnu */ +#ifdef HAVE_ALTIVEC_H /* gnu */ #define VEC_S16(a,b,c,d,e,f,g,h) {a, b, c, d, e, f, g, h} +#else /* apple */ +#define VEC_S16(a,b,c,d,e,f,g,h) (vector_s16_t) (a, b, c, d, e, f, g, h) #endif static const vector_s16_t constants ATTR_ALIGN(16) = diff --git a/libmpeg2/libmpeg-0.4.1.diff b/libmpeg2/libmpeg-0.4.1.diff index b54b28a952..8a39bd1498 100644 --- a/libmpeg2/libmpeg-0.4.1.diff +++ b/libmpeg2/libmpeg-0.4.1.diff @@ -50,20 +50,6 @@ +#endif /* ARCH_X86 || ARCH_X86_64 */ #if defined(ARCH_PPC) || defined(ARCH_SPARC) -@@ -166,10 +168,10 @@ - - canjump = 1; - --#ifdef HAVE_ALTIVEC_H /* gnu */ --#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t" --#else /* apple */ -+#if defined(__APPLE_CC__) /* apple */ - #define VAND(a,b,c) "vand v" #a ",v" #b ",v" #c "\n\t" -+#else /* gnu */ -+#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t" - #endif - asm volatile ("mtspr 256, %0\n\t" - VAND (0, 0, 0) @@ -212,7 +241,7 @@ accel = 0; |