You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	Convert typeof keyword into __typeof__; this is a gcc extension and the former is not accepted in C99 without GNU extensions enabled (e.g. via -fasm). This fixes compilation on PPC.
Originally committed as revision 27805 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
		| @@ -154,7 +154,7 @@ const vector unsigned char | ||||
|  | ||||
| #define vec_merge3(x2,x1,x0,y0,y1,y2)       \ | ||||
| do {                                        \ | ||||
|     typeof(x0) o0,o2,o3;                    \ | ||||
|     __typeof__(x0) o0,o2,o3;                \ | ||||
|         o0 = vec_mergeh (x0,x1);            \ | ||||
|         y0 = vec_perm (o0, x2, perm_rgb_0); \ | ||||
|         o2 = vec_perm (o0, x2, perm_rgb_1); \ | ||||
| @@ -165,7 +165,7 @@ do {                                        \ | ||||
|  | ||||
| #define vec_mstbgr24(x0,x1,x2,ptr)      \ | ||||
| do {                                    \ | ||||
|     typeof(x0) _0,_1,_2;                \ | ||||
|     __typeof__(x0) _0,_1,_2;            \ | ||||
|     vec_merge3 (x0,x1,x2,_0,_1,_2);     \ | ||||
|     vec_st (_0, 0, ptr++);              \ | ||||
|     vec_st (_1, 0, ptr++);              \ | ||||
| @@ -174,7 +174,7 @@ do {                                    \ | ||||
|  | ||||
| #define vec_mstrgb24(x0,x1,x2,ptr)      \ | ||||
| do {                                    \ | ||||
|     typeof(x0) _0,_1,_2;                \ | ||||
|     __typeof__(x0) _0,_1,_2;            \ | ||||
|     vec_merge3 (x2,x1,x0,_0,_1,_2);     \ | ||||
|     vec_st (_0, 0, ptr++);              \ | ||||
|     vec_st (_1, 0, ptr++);              \ | ||||
| @@ -222,12 +222,12 @@ do {                                                                          \ | ||||
|  | ||||
| #define vec_unh(x) \ | ||||
|     (vector signed short) \ | ||||
|         vec_perm(x,(typeof(x)){0}, \ | ||||
|         vec_perm(x,(__typeof__(x)){0}, \ | ||||
|                  ((vector unsigned char){0x10,0x00,0x10,0x01,0x10,0x02,0x10,0x03,\ | ||||
|                                          0x10,0x04,0x10,0x05,0x10,0x06,0x10,0x07})) | ||||
| #define vec_unl(x) \ | ||||
|     (vector signed short) \ | ||||
|         vec_perm(x,(typeof(x)){0}, \ | ||||
|         vec_perm(x,(__typeof__(x)){0}, \ | ||||
|                  ((vector unsigned char){0x10,0x08,0x10,0x09,0x10,0x0A,0x10,0x0B,\ | ||||
|                                          0x10,0x0C,0x10,0x0D,0x10,0x0E,0x10,0x0F})) | ||||
|  | ||||
| @@ -240,7 +240,7 @@ do {                                                                          \ | ||||
|         ((vector unsigned short)vec_max (x,((vector signed short) {0})), \ | ||||
|          (vector unsigned short)vec_max (y,((vector signed short) {0}))) | ||||
|  | ||||
| //#define out_pixels(a,b,c,ptr) vec_mstrgb32(typeof(a),((typeof (a)){0}),a,a,a,ptr) | ||||
| //#define out_pixels(a,b,c,ptr) vec_mstrgb32(__typeof__(a),((__typeof__ (a)){0}),a,a,a,ptr) | ||||
|  | ||||
|  | ||||
| static inline void cvtyuvtoRGB (SwsContext *c, | ||||
| @@ -441,10 +441,10 @@ static int altivec_##name (SwsContext *c,                               \ | ||||
| } | ||||
|  | ||||
|  | ||||
| #define out_abgr(a,b,c,ptr)  vec_mstrgb32(typeof(a),((typeof (a)){0}),c,b,a,ptr) | ||||
| #define out_bgra(a,b,c,ptr)  vec_mstrgb32(typeof(a),c,b,a,((typeof (a)){0}),ptr) | ||||
| #define out_rgba(a,b,c,ptr)  vec_mstrgb32(typeof(a),a,b,c,((typeof (a)){0}),ptr) | ||||
| #define out_argb(a,b,c,ptr)  vec_mstrgb32(typeof(a),((typeof (a)){0}),a,b,c,ptr) | ||||
| #define out_abgr(a,b,c,ptr)  vec_mstrgb32(__typeof__(a),((__typeof__ (a)){0}),c,b,a,ptr) | ||||
| #define out_bgra(a,b,c,ptr)  vec_mstrgb32(__typeof__(a),c,b,a,((__typeof__ (a)){0}),ptr) | ||||
| #define out_rgba(a,b,c,ptr)  vec_mstrgb32(__typeof__(a),a,b,c,((__typeof__ (a)){0}),ptr) | ||||
| #define out_argb(a,b,c,ptr)  vec_mstrgb32(__typeof__(a),((__typeof__ (a)){0}),a,b,c,ptr) | ||||
| #define out_rgb24(a,b,c,ptr) vec_mstrgb24(a,b,c,ptr) | ||||
| #define out_bgr24(a,b,c,ptr) vec_mstbgr24(a,b,c,ptr) | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user