[MPlayer-cvslog] CVS: main/postproc swscale_internal.h,1.16,1.17

Reimar Döffinger CVS syncmail at mplayerhq.hu
Sun May 7 20:14:52 CEST 2006


CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/postproc
In directory mail:/var2/tmp/cvs-serv30824

Modified Files:
	swscale_internal.h 
Log Message:
change the type of esp in SwsContext to uint64_t so it can hold a full register
also on 64 bit systems.


Index: swscale_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale_internal.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- swscale_internal.h	11 Feb 2006 14:16:10 -0000	1.16
+++ swscale_internal.h	7 May 2006 18:14:49 -0000	1.17
@@ -124,8 +124,8 @@
 #define LUM_MMX_FILTER_OFFSET "11*8"
 #define CHR_MMX_FILTER_OFFSET "11*8+4*4*256"
 #define DSTW_OFFSET  "11*8+4*4*256*2" //do not change, its hardcoded in the asm
-#define ESP_OFFSET  "11*8+4*4*256*2+4"
-#define VROUNDER_OFFSET "11*8+4*4*256*2+8"
+#define ESP_OFFSET  "11*8+4*4*256*2+8"
+#define VROUNDER_OFFSET "11*8+4*4*256*2+16"
                   
 	uint64_t redDither   __attribute__((aligned(8)));
 	uint64_t greenDither __attribute__((aligned(8)));
@@ -142,7 +142,7 @@
 	int32_t  lumMmxFilter[4*MAX_FILTER_SIZE];
 	int32_t  chrMmxFilter[4*MAX_FILTER_SIZE];
 	int dstW;
-	int esp;
+	uint64_t esp __attribute__((aligned(8)));
 	uint64_t vRounder     __attribute__((aligned(8)));
 
 #ifdef HAVE_ALTIVEC




More information about the MPlayer-cvslog mailing list