[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec/i386 dsputil_h264_template_mmx.c, 1.4, 1.5 dsputil_mmx.c, 1.109, 1.110 mpegvideo_mmx_template.c, 1.29, 1.30 vp3dsp_sse2.c, 1.9, 1.10

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/i386
In directory mail:/var2/tmp/cvs-serv488/libavcodec/i386

Modified Files:
	dsputil_h264_template_mmx.c dsputil_mmx.c 
	mpegvideo_mmx_template.c vp3dsp_sse2.c 
Log Message:
MSVC-compatible __align8/__align16 declaration
patch by Steve Lhomme, steve .dot. lhomme .at. free .dot. fr


Index: dsputil_h264_template_mmx.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_h264_template_mmx.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dsputil_h264_template_mmx.c	12 Jan 2006 22:43:17 -0000	1.4
+++ dsputil_h264_template_mmx.c	5 Feb 2006 13:35:17 -0000	1.5
@@ -25,8 +25,8 @@
  */
 static void H264_CHROMA_MC8_TMPL(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y)
 {
-    uint64_t AA __align8;
-    uint64_t DD __align8;
+    DECLARE_ALIGNED_8(uint64_t, AA);
+    DECLARE_ALIGNED_8(uint64_t, DD);
     int i;
 
     if(y==0 && x==0) {
@@ -242,8 +242,8 @@
 
 static void H264_CHROMA_MC4_TMPL(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y)
 {
-    uint64_t AA __align8;
-    uint64_t DD __align8;
+    DECLARE_ALIGNED_8(uint64_t, AA);
+    DECLARE_ALIGNED_8(uint64_t, DD);
     int i;
 
     /* no special case for mv=(0,0) in 4x*, since it's much less common than in 8x*.

Index: dsputil_mmx.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- dsputil_mmx.c	12 Jan 2006 22:43:17 -0000	1.109
+++ dsputil_mmx.c	5 Feb 2006 13:35:17 -0000	1.110
@@ -303,7 +303,7 @@
             :"memory");
 }
 
-static const unsigned char __align8 vector128[8] =
+static DECLARE_ALIGNED_8(const unsigned char, vector128[8]) =
   { 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 };
 
 void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size)
@@ -1546,7 +1546,7 @@
         "movq "#d", "#o"+48(%1)       \n\t"\
 
 static int hadamard8_diff_mmx(void *s, uint8_t *src1, uint8_t *src2, int stride, int h){
-    uint64_t temp[16] __align8;
+    DECLARE_ALIGNED_8(uint64_t, temp[16]);
     int sum=0;
 
     assert(h==8);
@@ -1633,7 +1633,7 @@
 }
 
 static int hadamard8_diff_mmx2(void *s, uint8_t *src1, uint8_t *src2, int stride, int h){
-    uint64_t temp[16] __align8;
+    DECLARE_ALIGNED_8(uint64_t, temp[16]);
     int sum=0;
 
     assert(h==8);

Index: mpegvideo_mmx_template.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- mpegvideo_mmx_template.c	12 Jan 2006 22:43:18 -0000	1.29
+++ mpegvideo_mmx_template.c	5 Feb 2006 13:35:17 -0000	1.30
@@ -51,7 +51,7 @@
     long last_non_zero_p1;
     int level=0, q; //=0 is cuz gcc says uninitalized ...
     const uint16_t *qmat, *bias;
-    __align8 int16_t temp_block[64];
+    DECLARE_ALIGNED_8(int16_t, temp_block[64]);
 
     assert((7&(int)(&temp_block[0])) == 0); //did gcc align it correctly?
 

Index: vp3dsp_sse2.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/vp3dsp_sse2.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- vp3dsp_sse2.c	12 Jan 2006 22:43:18 -0000	1.9
+++ vp3dsp_sse2.c	5 Feb 2006 13:35:17 -0000	1.10
@@ -24,7 +24,7 @@
 #include "../dsputil.h"
 #include "mmx.h"
 
-static const unsigned short __align16 SSE2_dequant_const[] =
+static DECLARE_ALIGNED_16(const unsigned short, SSE2_dequant_const[]) =
 {
     0,65535,65535,0,0,0,0,0,    // 0x0000 0000 0000 0000 0000 FFFF FFFF 0000
     0,0,0,0,65535,65535,0,0,    // 0x0000 0000 FFFF FFFF 0000 0000 0000 0000
@@ -35,7 +35,7 @@
     0,0,65535,65535, 0,0,0,0    // 0x0000 0000 0000 0000 FFFF FFFF 0000 0000
 };
 
-static const unsigned int __align16 eight_data[] =
+static DECLARE_ALIGNED_16(const unsigned int, eight_data[]) =
 {
     0x00080008,
     0x00080008,
@@ -43,7 +43,7 @@
     0x00080008
 };
 
-static const unsigned short __align16 SSE2_idct_data[7 * 8] =
+static DECLARE_ALIGNED_16(const unsigned short, SSE2_idct_data[7 * 8]) =
 {
     64277,64277,64277,64277,64277,64277,64277,64277,
     60547,60547,60547,60547,60547,60547,60547,60547,