Revision 69796008

View differences:

libswscale/rgb2rgb.c
134 134
	0x0602060206020602LL,
135 135
	0x0004000400040004LL,};
136 136
#endif
137
#endif
137
#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */
138 138

  
139 139
#define RGB2YUV_SHIFT 8
140 140
#define BY ((int)( 0.098*(1<<RGB2YUV_SHIFT)+0.5))
......
287 287
		vu9_to_vu12= vu9_to_vu12_MMX;
288 288
		yvu9_to_yuy2= yvu9_to_yuy2_MMX;
289 289
	}else
290
#endif
290
#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */
291 291
	{
292 292
		rgb15to16= rgb15to16_C;
293 293
		rgb15to24= rgb15to24_C;
libswscale/swscale.c
193 193
static const uint64_t bgr2YCoeff  attribute_used __attribute__((aligned(8))) = 0x000020E540830C8BULL;
194 194
static const uint64_t bgr2UCoeff  attribute_used __attribute__((aligned(8))) = 0x0000ED0FDAC23831ULL;
195 195
static const uint64_t bgr2VCoeff  attribute_used __attribute__((aligned(8))) = 0x00003831D0E6F6EAULL;
196
#endif
196
#endif /* FAST_BGR2YV12 */
197 197
static const uint64_t bgr2YOffset attribute_used __attribute__((aligned(8))) = 0x1010101010101010ULL;
198 198
static const uint64_t bgr2UVOffset attribute_used __attribute__((aligned(8)))= 0x8080808080808080ULL;
199 199
static const uint64_t w1111       attribute_used __attribute__((aligned(8))) = 0x0001000100010001ULL;
200
#endif
200
#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */
201 201

  
202 202
// clipping helper table for C implementations:
203 203
static unsigned char clip_table[768];
......
1428 1428
	  return swScale_C;
1429 1429
#endif
1430 1430
	return swScale_C;
1431
#endif
1431
#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */
1432 1432
#else //RUNTIME_CPUDETECT
1433 1433
#ifdef HAVE_MMX2
1434 1434
	return swScale_MMX2;
......
1868 1868
#elif defined (HAVE_ALTIVEC)
1869 1869
	flags |= SWS_CPU_CAPS_ALTIVEC;
1870 1870
#endif
1871
#endif
1871
#endif /* RUNTIME_CPUDETECT */
1872 1872
	if(clip_table[512] != 255) globalInit();
1873 1873
	if(rgb15to16 == NULL) sws_rgb2rgb_init(flags);
1874 1874

  
......
2113 2113
			initMMX2HScaler(      dstW, c->lumXInc, c->funnyYCode , c->lumMmx2Filter, c->lumMmx2FilterPos, 8);
2114 2114
			initMMX2HScaler(c->chrDstW, c->chrXInc, c->funnyUVCode, c->chrMmx2Filter, c->chrMmx2FilterPos, 4);
2115 2115
		}
2116
#endif
2116
#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */
2117 2117
	} // Init Horizontal stuff
2118 2118

  
2119 2119

  
......
2712 2712
#endif
2713 2713
	c->funnyYCode=NULL;
2714 2714
	c->funnyUVCode=NULL;
2715
#endif
2715
#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */
2716 2716

  
2717 2717
	av_free(c->lumMmx2Filter);
2718 2718
	c->lumMmx2Filter=NULL;
libswscale/yuv2rgb.c
198 198
#define RENAME(a) a ## _MMX2
199 199
#include "yuv2rgb_template.c"
200 200

  
201
#endif // CAN_COMPILE_X86_ASM
201
#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */
202 202

  
203 203
const int32_t Inverse_Table_6_9[8][4] = {
204 204
    {117504, 138453, 13954, 34903}, /* no sequence_display_extension */

Also available in: Unified diff