Mercurial > mplayer.hg
annotate libmpeg2/libmpeg2_changes.diff @ 31311:9ce59b78dbfd
Remove mp_msg related GUI hacks.
author | reimar |
---|---|
date | Sun, 13 Jun 2010 11:17:26 +0000 |
parents | a51baa308479 |
children | 60709ef498be |
rev | line source |
---|---|
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
1 --- libmpeg2/cpu_accel.c 2006-06-16 20:12:26.000000000 +0200 |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
2 +++ libmpeg2/cpu_accel.c 2006-06-16 20:12:50.000000000 +0200 |
27573 | 3 @@ -29,9 +33,13 @@ |
4 #include "attributes.h" | |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
5 #include "mpeg2_internal.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
6 |
27573 | 7 +#include "cpudetect.h" |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
8 + |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
9 -#if defined(ARCH_X86) || defined(ARCH_X86_64) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
10 +#if ARCH_X86 || ARCH_X86_64 |
27573 | 11 static inline uint32_t arch_accel (uint32_t accel) |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
12 { |
27573 | 13 +/* Use MPlayer CPU detection instead of libmpeg2 variant. */ |
14 +#if 0 | |
15 if (accel & (MPEG2_ACCEL_X86_3DNOW | MPEG2_ACCEL_X86_MMXEXT)) | |
16 accel |= MPEG2_ACCEL_X86_MMX; | |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
17 |
27573 | 18 @@ -124,6 +132,21 @@ |
19 #endif /* ACCEL_DETECT */ | |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
20 |
27573 | 21 return accel; |
22 + | |
23 +#else /* 0 */ | |
24 + accel = 0; | |
25 + if (gCpuCaps.hasMMX) | |
26 + accel |= MPEG2_ACCEL_X86_MMX; | |
27 + if (gCpuCaps.hasSSE2) | |
28 + accel |= MPEG2_ACCEL_X86_SSE2; | |
29 + if (gCpuCaps.hasMMX2) | |
30 + accel |= MPEG2_ACCEL_X86_MMXEXT; | |
31 + if (gCpuCaps.has3DNow) | |
32 + accel |= MPEG2_ACCEL_X86_3DNOW; | |
33 + | |
34 + return accel; | |
35 + | |
36 +#endif /* 0 */ | |
37 } | |
38 #endif /* ARCH_X86 || ARCH_X86_64 */ | |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
39 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
40 @@ -127,7 +150,7 @@ |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
41 } |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
42 #endif /* ARCH_X86 || ARCH_X86_64 */ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
43 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
44 -#if defined(ACCEL_DETECT) && (defined(ARCH_PPC) || defined(ARCH_SPARC)) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
45 +#if defined(ACCEL_DETECT) && (ARCH_PPC || ARCH_SPARC) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
46 #include <signal.h> |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
47 #include <setjmp.h> |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
48 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
49 @@ -146,7 +169,7 @@ |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
50 } |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
51 #endif /* ACCEL_DETECT && (ARCH_PPC || ARCH_SPARC) */ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
52 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
53 -#ifdef ARCH_PPC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
54 +#if ARCH_PPC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
55 static uint32_t arch_accel (uint32_t accel) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
56 { |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
57 #ifdef ACCEL_DETECT |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
58 @@ -183,7 +206,7 @@ |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
59 } |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
60 #endif /* ARCH_PPC */ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
61 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
62 -#ifdef ARCH_SPARC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
63 +#if ARCH_SPARC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
64 static uint32_t arch_accel (uint32_t accel) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
65 { |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
66 if (accel & MPEG2_ACCEL_SPARC_VIS2) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
67 @@ -229,7 +252,7 @@ |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
68 } |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
69 #endif /* ARCH_SPARC */ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
70 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
71 -#ifdef ARCH_ALPHA |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
72 +#if ARCH_ALPHA |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
73 static inline uint32_t arch_accel (uint32_t accel) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
74 { |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
75 if (accel & MPEG2_ACCEL_ALPHA_MVI) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
76 @@ -253,7 +276,7 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
77 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
78 uint32_t mpeg2_detect_accel (uint32_t accel) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
79 { |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
80 -#if defined (ARCH_X86) || defined (ARCH_X86_64) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
81 +#if ARCH_X86 || ARCH_X86_64 || ARCH_PPC || ARCH_ALPHA || ARCH_SPARC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
82 accel = arch_accel (accel); |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
83 #endif |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
84 return accel; |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
85 Index: libmpeg2/cpu_state.c |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
86 =================================================================== |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
87 --- libmpeg2/cpu_state.c (revision 28324) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
88 +++ libmpeg2/cpu_state.c (revision 28325) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
89 @@ -29,21 +29,21 @@ |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
90 #include "mpeg2.h" |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
91 #include "attributes.h" |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
92 #include "mpeg2_internal.h" |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
93 -#if defined(ARCH_X86) || defined(ARCH_X86_64) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
94 +#if ARCH_X86 || ARCH_X86_64 |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
95 #include "mmx.h" |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
96 #endif |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
97 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
98 void (* mpeg2_cpu_state_save) (cpu_state_t * state) = NULL; |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
99 void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = NULL; |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
100 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
101 -#if defined(ARCH_X86) || defined(ARCH_X86_64) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
102 +#if ARCH_X86 || ARCH_X86_64 |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
103 static void state_restore_mmx (cpu_state_t * state) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
104 { |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
105 emms (); |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
106 } |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
107 #endif |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
108 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
109 -#ifdef ARCH_PPC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
110 +#if ARCH_PPC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
111 #if defined(__APPLE_CC__) /* apple */ |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
112 #define LI(a,b) "li r" #a "," #b "\n\t" |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
113 #define STVX0(a,b,c) "stvx v" #a ",0,r" #c "\n\t" |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
114 @@ -115,12 +115,12 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
115 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
116 void mpeg2_cpu_state_init (uint32_t accel) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
117 { |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
118 -#if defined(ARCH_X86) || defined(ARCH_X86_64) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
119 +#if ARCH_X86 || ARCH_X86_64 |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
120 if (accel & MPEG2_ACCEL_X86_MMX) { |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
121 mpeg2_cpu_state_restore = state_restore_mmx; |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
122 } |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
123 #endif |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
124 -#ifdef ARCH_PPC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
125 +#if ARCH_PPC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
126 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) { |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
127 mpeg2_cpu_state_save = state_save_altivec; |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
128 mpeg2_cpu_state_restore = state_restore_altivec; |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
129 --- libmpeg2/idct.c (revision 26652) |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
130 +++ libmpeg2/idct.c (working copy) |
27573 | 131 @@ -235,34 +239,40 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
132 |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
133 void mpeg2_idct_init (uint32_t accel) |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
134 { |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
135 -#ifdef ARCH_X86 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
136 +#if HAVE_SSE2 |
27573 | 137 if (accel & MPEG2_ACCEL_X86_SSE2) { |
138 mpeg2_idct_copy = mpeg2_idct_copy_sse2; | |
139 mpeg2_idct_add = mpeg2_idct_add_sse2; | |
140 mpeg2_idct_mmx_init (); | |
141 - } else if (accel & MPEG2_ACCEL_X86_MMXEXT) { | |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
142 + } else |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
143 +#elif HAVE_MMX2 |
27573 | 144 + if (accel & MPEG2_ACCEL_X86_MMXEXT) { |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
145 mpeg2_idct_copy = mpeg2_idct_copy_mmxext; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
146 mpeg2_idct_add = mpeg2_idct_add_mmxext; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
147 mpeg2_idct_mmx_init (); |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
148 - } else if (accel & MPEG2_ACCEL_X86_MMX) { |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
149 + } else |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
150 +#elif HAVE_MMX |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
151 + if (accel & MPEG2_ACCEL_X86_MMX) { |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
152 mpeg2_idct_copy = mpeg2_idct_copy_mmx; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
153 mpeg2_idct_add = mpeg2_idct_add_mmx; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
154 mpeg2_idct_mmx_init (); |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
155 } else |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
156 #endif |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
157 -#ifdef ARCH_PPC |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
158 +#if HAVE_ALTIVEC |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
159 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) { |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
160 mpeg2_idct_copy = mpeg2_idct_copy_altivec; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
161 mpeg2_idct_add = mpeg2_idct_add_altivec; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
162 mpeg2_idct_altivec_init (); |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
163 } else |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
164 #endif |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
165 -#ifdef ARCH_ALPHA |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
166 +#if HAVE_MVI |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
167 if (accel & MPEG2_ACCEL_ALPHA_MVI) { |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
168 mpeg2_idct_copy = mpeg2_idct_copy_mvi; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
169 mpeg2_idct_add = mpeg2_idct_add_mvi; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
170 mpeg2_idct_alpha_init (); |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
171 - } else if (accel & MPEG2_ACCEL_ALPHA) { |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
172 + } else |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
173 +#elif ARCH_ALPHA |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
174 + if (accel & MPEG2_ACCEL_ALPHA) { |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
175 int i; |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
176 |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
177 mpeg2_idct_copy = mpeg2_idct_copy_alpha; |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
178 Index: libmpeg2/idct_alpha.c |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
179 =================================================================== |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
180 --- libmpeg2/idct_alpha.c (revision 28324) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
181 +++ libmpeg2/idct_alpha.c (revision 28325) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
182 @@ -24,7 +24,7 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
183 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
184 #include "config.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
185 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
186 -#ifdef ARCH_ALPHA |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
187 +#if ARCH_ALPHA |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
188 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
189 #include <stdlib.h> |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
190 #include <inttypes.h> |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
191 Index: libmpeg2/idct_altivec.c |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
192 =================================================================== |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
193 --- libmpeg2/idct_altivec.c (revision 28324) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
194 +++ libmpeg2/idct_altivec.c (revision 28325) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
195 @@ -23,7 +23,7 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
196 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
197 #include "config.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
198 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
199 -#ifdef ARCH_PPC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
200 +#if ARCH_PPC |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
201 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
202 #ifdef HAVE_ALTIVEC_H |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
203 #include <altivec.h> |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
204 Index: libmpeg2/idct_mmx.c |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
205 =================================================================== |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
206 --- libmpeg2/idct_mmx.c (revision 28324) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
207 +++ libmpeg2/idct_mmx.c (revision 28325) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
208 @@ -23,7 +23,7 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
209 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
210 #include "config.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
211 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
212 -#if defined(ARCH_X86) || defined(ARCH_X86_64) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
213 +#if ARCH_X86 || ARCH_X86_64 |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
214 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
215 #include <inttypes.h> |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
216 |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
217 --- libmpeg2/motion_comp.c 2006-06-16 20:12:26.000000000 +0200 |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
218 +++ libmpeg2/motion_comp.c 2006-06-16 20:12:50.000000000 +0200 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
219 @@ -33,34 +37,40 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
220 |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
221 void mpeg2_mc_init (uint32_t accel) |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
222 { |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
223 -#ifdef ARCH_X86 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
224 +#if HAVE_MMX2 |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
225 if (accel & MPEG2_ACCEL_X86_MMXEXT) |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
226 mpeg2_mc = mpeg2_mc_mmxext; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
227 - else if (accel & MPEG2_ACCEL_X86_3DNOW) |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
228 + else |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
229 +#endif |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
230 +#if HAVE_AMD3DNOW |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
231 + if (accel & MPEG2_ACCEL_X86_3DNOW) |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
232 mpeg2_mc = mpeg2_mc_3dnow; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
233 - else if (accel & MPEG2_ACCEL_X86_MMX) |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
234 + else |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
235 +#endif |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
236 +#if HAVE_MMX |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
237 + if (accel & MPEG2_ACCEL_X86_MMX) |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
238 mpeg2_mc = mpeg2_mc_mmx; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
239 else |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
240 #endif |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
241 -#ifdef ARCH_PPC |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
242 +#if HAVE_ALTIVEC |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
243 if (accel & MPEG2_ACCEL_PPC_ALTIVEC) |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
244 mpeg2_mc = mpeg2_mc_altivec; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
245 else |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
246 #endif |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
247 -#ifdef ARCH_ALPHA |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
248 +#if ARCH_ALPHA |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
249 if (accel & MPEG2_ACCEL_ALPHA) |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
250 mpeg2_mc = mpeg2_mc_alpha; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
251 else |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
252 #endif |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
253 -#ifdef ARCH_SPARC |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
254 +#if HAVE_VIS |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
255 if (accel & MPEG2_ACCEL_SPARC_VIS) |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
256 mpeg2_mc = mpeg2_mc_vis; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
257 else |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
258 #endif |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
259 -#ifdef ARCH_ARM |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
260 +#if ARCH_ARM |
27573 | 261 - if (accel & MPEG2_ACCEL_ARM) { |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
262 + if (accel & MPEG2_ACCEL_ARM) |
27573 | 263 mpeg2_mc = mpeg2_mc_arm; |
264 - } else | |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
265 + else |
27573 | 266 #endif |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
267 mpeg2_mc = mpeg2_mc_c; |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
268 } |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
269 Index: libmpeg2/motion_comp_alpha.c |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
270 =================================================================== |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
271 --- libmpeg2/motion_comp_alpha.c (revision 28324) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
272 +++ libmpeg2/motion_comp_alpha.c (revision 28325) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
273 @@ -22,7 +22,7 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
274 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
275 #include "config.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
276 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
277 -#ifdef ARCH_ALPHA |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
278 +#if ARCH_ALPHA |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
279 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
280 #include <inttypes.h> |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
281 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
282 Index: libmpeg2/motion_comp_altivec.c |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
283 =================================================================== |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
284 --- libmpeg2/motion_comp_altivec.c (revision 28324) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
285 +++ libmpeg2/motion_comp_altivec.c (revision 28325) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
286 @@ -23,7 +23,7 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
287 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
288 #include "config.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
289 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
290 -#ifdef ARCH_PPC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
291 +#if ARCH_PPC |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
292 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
293 #ifdef HAVE_ALTIVEC_H |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
294 #include <altivec.h> |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
295 Index: libmpeg2/motion_comp_arm.c |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
296 =================================================================== |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
297 --- libmpeg2/motion_comp_arm.c (revision 28324) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
298 +++ libmpeg2/motion_comp_arm.c (revision 28325) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
299 @@ -22,7 +22,7 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
300 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
301 #include "config.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
302 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
303 -#ifdef ARCH_ARM |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
304 +#if ARCH_ARM |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
305 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
306 #include <inttypes.h> |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
307 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
308 Index: libmpeg2/motion_comp_mmx.c |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
309 =================================================================== |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
310 --- libmpeg2/motion_comp_mmx.c (revision 28324) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
311 +++ libmpeg2/motion_comp_mmx.c (revision 28325) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
312 @@ -23,7 +23,7 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
313 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
314 #include "config.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
315 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
316 -#if defined(ARCH_X86) || defined(ARCH_X86_64) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
317 +#if ARCH_X86 || ARCH_X86_64 |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
318 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
319 #include <inttypes.h> |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
320 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
321 Index: libmpeg2/motion_comp_vis.c |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
322 =================================================================== |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
323 --- libmpeg2/motion_comp_vis.c (revision 28324) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
324 +++ libmpeg2/motion_comp_vis.c (revision 28325) |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
325 @@ -22,7 +22,7 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
326 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
327 #include "config.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
328 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
329 -#ifdef ARCH_SPARC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
330 +#if ARCH_SPARC |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
331 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
332 #include <inttypes.h> |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
333 |
27569
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
334 --- libmpeg2/mpeg2_internal.h 2006-06-16 20:12:26.000000000 +0200 |
7c3d535aba22
Remove version string from name of local changes diff file.
diego
parents:
diff
changeset
|
335 +++ libmpeg2/mpeg2_internal.h 2006-06-16 20:12:50.000000000 +0200 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
336 @@ -226,7 +238,7 @@ |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
337 }; |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28796
diff
changeset
|
338 |
28796
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
339 typedef struct { |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
340 -#ifdef ARCH_PPC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
341 +#if ARCH_PPC |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
342 uint8_t regv[12*16]; |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
343 #endif |
621228f94c83
Sync local changes file with #ifdef --> #if conversion.
diego
parents:
28335
diff
changeset
|
344 int dummy; |