# HG changeset patch # User reimar # Date 1149504718 0 # Node ID e00cea3e17324944004389911c4539e1f8d2cca7 # Parent 804b83cf6dee743f46c040ca6ade4aa063e62f9f fix variable type used via "m" asm constraint to match size used in asm. fixes crashes on AMD64. diff -r 804b83cf6dee -r e00cea3e1732 postproc/swscale_template.c --- a/postproc/swscale_template.c Mon Jun 05 08:24:17 2006 +0000 +++ b/postproc/swscale_template.c Mon Jun 05 10:51:58 2006 +0000 @@ -873,9 +873,9 @@ */ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, - uint8_t *dest, int dstW, int dstY) + uint8_t *dest, long dstW, long dstY) { - int dummy=0; + long dummy=0; switch(c->dstFormat) { #ifdef HAVE_MMX @@ -2223,7 +2223,7 @@ #endif } // *** horizontal scale Y line to temp buffer -static inline void RENAME(hyscale)(uint16_t *dst, int dstWidth, uint8_t *src, int srcW, int xInc, +static inline void RENAME(hyscale)(uint16_t *dst, long dstWidth, uint8_t *src, int srcW, int xInc, int flags, int canMMX2BeUsed, int16_t *hLumFilter, int16_t *hLumFilterPos, int hLumFilterSize, void *funnyYCode, int srcFormat, uint8_t *formatConvBuffer, int16_t *mmx2Filter, @@ -2336,8 +2336,8 @@ else { #endif - int xInc_shr16 = xInc >> 16; - int xInc_mask = xInc & 0xffff; + long xInc_shr16 = xInc >> 16; + uint16_t xInc_mask = xInc & 0xffff; //NO MMX just normal asm ... asm volatile( "xor %%"REG_a", %%"REG_a" \n\t" // i @@ -2535,7 +2535,7 @@ { #endif long xInc_shr16 = (long) (xInc >> 16); - int xInc_mask = xInc & 0xffff; + uint16_t xInc_mask = xInc & 0xffff; asm volatile( "xor %%"REG_a", %%"REG_a" \n\t" // i "xor %%"REG_b", %%"REG_b" \n\t" // xx