|
From: Andreas R. <and...@us...> - 2002-05-05 18:52:59
|
Update of /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video
In directory usw-pr-cvs1:/tmp/cvs-serv20833/libmpeg/video
Modified Files:
idct.c output.c slice.c
Log Message:
few fixes for MSVC builds of libmpeg
Index: idct.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/idct.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** idct.c 24 Oct 2001 23:12:16 -0000 1.1.1.1
--- idct.c 5 May 2002 18:52:56 -0000 1.2
***************
*** 33,36 ****
--- 33,41 ----
#include <stdlib.h>
+ #ifdef _MSC_VER
+ /* inline is unrecognized keyword in C mode of MSVC */
+ #define inline __inline
+ #endif
+
/**********************************************************/
/* inverse two dimensional DCT, Chen-Wang algorithm */
Index: output.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/output.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** output.c 24 Oct 2001 23:12:18 -0000 1.1.1.1
--- output.c 5 May 2002 18:52:56 -0000 1.2
***************
*** 46,49 ****
--- 46,52 ----
int doClippingArrays=1;
+ static unsigned char mpeg3_601_to_rgb[256];
+
+ #ifdef HAVE_MMX
static long long mpeg3_MMX_0 = 0L;
***************
*** 65,70 ****
static unsigned short mpeg3_MMX_grnmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; /*dd 003e0 03e0h, 003e003e0h */
- static unsigned char mpeg3_601_to_rgb[256];
-
/* Algorithm */
/* r = (int)(*y + 1.371 * (*cr - 128)); */
--- 68,71 ----
***************
*** 72,76 ****
/* b = (int)(*y + 1.732 * (*cb - 128)); */
- #ifdef HAVE_MMX
inline void mpeg3video_rgb16_mmx(unsigned char *lum,
unsigned char *cr,
--- 73,76 ----
Index: slice.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/slice.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** slice.c 24 Oct 2001 23:12:21 -0000 1.1.1.1
--- slice.c 5 May 2002 18:52:56 -0000 1.2
***************
*** 37,41 ****
--- 37,43 ----
#include <stdlib.h>
+ #ifdef HAVE_MMX
static unsigned long long MMX_128 = 0x80008000800080LL;
+ #endif
int mpeg3_new_slice_buffer(mpeg3_slice_buffer_t *slice_buffer)
|