Mercurial > mplayer.hg

comparison libmpeg2/libmpeg-0.4.0.diff @ 13020:3380d4a65b15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Patch updated for latest changes to libmpeg2.
author diego
date Sat, 14 Aug 2004 15:50:50 +0000
parents 69a86525f49e
children 456a348bd973
comparison
equal deleted inserted replaced
13019:69a86525f49e 13020:3380d4a65b15
1 diff -ur libmpeg2/cpu_accel.c libmpeg2/cpu_accel.c 1 diff -ur libmpeg2/cpu_accel.c libmpeg2/cpu_accel.c
2 --- libmpeg2/cpu_accel.c 2003-10-06 04:31:52.000000000 +0200 2 --- libmpeg2/cpu_accel.c 2003-10-06 04:31:52.000000000 +0200
3 +++ libmpeg2/cpu_accel.c 2004-02-18 13:48:26.000000000 +0100 3 +++ libmpeg2/cpu_accel.c 2004-02-18 13:48:26.000000000 +0100
4 @@ -108,7 +108,7 @@
5 }
6 #endif /* ARCH_X86 */
7
8 -#if defined(ARCH_PPC) || defined(ARCH_SPARC)
9 +#if defined(ARCH_PPC) || (defined(ARCH_SPARC) && defined(HAVE_VIS))
10 #include <signal.h>
11 #include <setjmp.h>
12
4 @@ -195,6 +195,7 @@ 13 @@ -195,6 +195,7 @@
5 #ifdef ARCH_ALPHA 14 #ifdef ARCH_ALPHA
6 static inline uint32_t arch_accel (void) 15 static inline uint32_t arch_accel (void)
7 { 16 {
8 +#ifdef CAN_COMPILE_ALPHA_MVI 17 +#ifdef CAN_COMPILE_ALPHA_MVI
154 163
155 mpeg2_idct_copy = mpeg2_idct_copy_alpha; 164 mpeg2_idct_copy = mpeg2_idct_copy_alpha;
156 diff -ur libmpeg2/motion_comp.c libmpeg2/motion_comp.c 165 diff -ur libmpeg2/motion_comp.c libmpeg2/motion_comp.c
157 --- libmpeg2/motion_comp.c 2003-10-06 04:31:52.000000000 +0200 166 --- libmpeg2/motion_comp.c 2003-10-06 04:31:52.000000000 +0200
158 +++ libmpeg2/motion_comp.c 2004-02-18 13:48:37.000000000 +0100 167 +++ libmpeg2/motion_comp.c 2004-02-18 13:48:37.000000000 +0100
159 @@ -43,10 +43,12 @@ 168 @@ -43,20 +43,24 @@
160 else 169 else
161 #endif 170 #endif
162 #ifdef ARCH_PPC 171 #ifdef ARCH_PPC
163 +#ifdef HAVE_ALTIVEC 172 +#ifdef HAVE_ALTIVEC
164 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) 173 if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
167 #endif 176 #endif
168 +#endif 177 +#endif
169 #ifdef ARCH_ALPHA 178 #ifdef ARCH_ALPHA
170 if (accel & MPEG2_ACCEL_ALPHA) 179 if (accel & MPEG2_ACCEL_ALPHA)
171 mpeg2_mc = mpeg2_mc_alpha; 180 mpeg2_mc = mpeg2_mc_alpha;
181 else
182 #endif
183 #ifdef ARCH_SPARC
184 +#ifdef HAVE_VIS
185 if (accel & MPEG2_ACCEL_SPARC_VIS)
186 mpeg2_mc = mpeg2_mc_vis;
187 else
188 #endif
189 +#endif
190 mpeg2_mc = mpeg2_mc_c;
191 }
192
172 diff -ur libmpeg2/mpeg2_internal.h libmpeg2/mpeg2_internal.h 193 diff -ur libmpeg2/mpeg2_internal.h libmpeg2/mpeg2_internal.h
173 --- libmpeg2/mpeg2_internal.h 2003-12-22 12:24:02.000000000 +0100 194 --- libmpeg2/mpeg2_internal.h 2003-12-22 12:24:02.000000000 +0100
174 +++ libmpeg2/mpeg2_internal.h 2004-08-02 18:09:17.000000000 +0200 195 +++ libmpeg2/mpeg2_internal.h 2004-08-02 18:09:17.000000000 +0200
175 @@ -144,6 +144,11 @@ 196 @@ -144,6 +144,11 @@
176 int second_field; 197 int second_field;