[Mplayerxp-cvslog] CVS: mplayerxp/mplayerxp/libmpcodecs Makefile,1.6,1.7 ad_dk3adpcm.c,1.3,1.4 ad_dk4adpcm.c,1.3,1.4 ad_imaadpcm.c,1.3,1.4 ad_msadpcm.c,1.3,1.4 vd_cyuv.c,1.4,1.5 vd_divx4.c,1.9,1.10 vd_nuv.c,1.3,1.4 vd_qtrle.c,1.3,1.4 vd_qtrpza.c,1.3,1.4 vd_real.c,1.1,1.2 vd_xvid.c,1.2,1.3

[M?ns Rullg?rd <mr...@us...>]

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs
In directory usw-pr-cvs1:/tmp/cvs-serv351/mplayerxp/libmpcodecs

Modified Files:
	Makefile ad_dk3adpcm.c ad_dk4adpcm.c ad_imaadpcm.c 
	ad_msadpcm.c vd_cyuv.c vd_divx4.c vd_nuv.c vd_qtrle.c 
	vd_qtrpza.c vd_real.c vd_xvid.c 
Log Message:
Various 64-bit and Alpha related fixes.


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	12 Jun 2002 15:02:47 -0000	1.6
+++ Makefile	30 Jun 2002 21:21:07 -0000	1.7
@@ -9,7 +9,7 @@
 
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = -Wall $(OPTFLAGS) -I. -I.. -I../libmpdemux -I../loader $(EXTRA_INC)
+CFLAGS = -g -Wall $(OPTFLAGS) -I. -I.. -I../libmpdemux -I../loader $(EXTRA_INC)
 
 .SUFFIXES: .c .o
 

Index: ad_dk3adpcm.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/ad_dk3adpcm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ad_dk3adpcm.c	29 Apr 2002 17:32:58 -0000	1.3
+++ ad_dk3adpcm.c	30 Jun 2002 21:21:07 -0000	1.4
@@ -25,7 +25,7 @@
 {
   if(!(dll_handle=ld_codec(libname,NULL))) return 0;
   dk3_adpcm_decode_block_ptr = dlsym(dll_handle,"dk3_adpcm_decode_block");
-  return (int)dk3_adpcm_decode_block_ptr;
+  return dk3_adpcm_decode_block_ptr != NULL;
 }
 
 int init(sh_audio_t *sh_audio)

Index: ad_dk4adpcm.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/ad_dk4adpcm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ad_dk4adpcm.c	29 Apr 2002 17:32:58 -0000	1.3
+++ ad_dk4adpcm.c	30 Jun 2002 21:21:07 -0000	1.4
@@ -26,7 +26,7 @@
 {
   if(!(dll_handle=ld_codec(libname,NULL))) return 0;
   dk4_adpcm_decode_block_ptr = dlsym(dll_handle,"dk4_adpcm_decode_block");
-  return (int)dk4_adpcm_decode_block_ptr;
+  return dk4_adpcm_decode_block_ptr != NULL;
 }
 
 int init(sh_audio_t *sh_audio)

Index: ad_imaadpcm.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/ad_imaadpcm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ad_imaadpcm.c	29 Apr 2002 17:33:02 -0000	1.3
+++ ad_imaadpcm.c	30 Jun 2002 21:21:07 -0000	1.4
@@ -27,7 +27,7 @@
 {
   if(!(dll_handle=ld_codec(libname,NULL))) return 0;
   ima_adpcm_decode_block_ptr = dlsym(dll_handle,"ima_adpcm_decode_block");
-  return (int)ima_adpcm_decode_block_ptr;
+  return ima_adpcm_decode_block_ptr != NULL;
 }
 
 int init(sh_audio_t *sh_audio)

Index: ad_msadpcm.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/ad_msadpcm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ad_msadpcm.c	29 Apr 2002 17:33:03 -0000	1.3
+++ ad_msadpcm.c	30 Jun 2002 21:21:07 -0000	1.4
@@ -27,7 +27,7 @@
 {
   if(!(dll_handle=ld_codec(libname,NULL))) return 0;
   ms_adpcm_decode_block_ptr = dlsym(dll_handle,"ms_adpcm_decode_block");
-  return (int)ms_adpcm_decode_block_ptr;
+  return ms_adpcm_decode_block_ptr != NULL;
 }
 
 int init(sh_audio_t *sh_audio)

Index: vd_cyuv.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_cyuv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vd_cyuv.c	7 Jun 2002 09:02:03 -0000	1.4
+++ vd_cyuv.c	30 Jun 2002 21:21:07 -0000	1.5
@@ -30,7 +30,7 @@
 {
   if(!(dll_handle=ld_codec(libname,NULL))) return 0;
   decode_cyuv_ptr = dlsym(dll_handle,"decode_cyuv");
-  return (int)decode_cyuv_ptr;
+  return decode_cyuv_ptr != NULL;
 }
 
 // to set/get/query special features/parameters

Index: vd_divx4.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_divx4.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- vd_divx4.c	7 Jun 2002 09:02:03 -0000	1.9
+++ vd_divx4.c	30 Jun 2002 21:21:07 -0000	1.10
@@ -102,7 +102,7 @@
   if(memcmp(decore_ptr,d4id,35) == 0) dll_ver = DIVX4LINUX;
   symbol = dlsym(dll_handle,"qpel_CopyMBlock");
   if(symbol) dll_ver = DIVX5LINUX;
-  return (int)decore_ptr;
+  return decore_ptr != NULL;
 }
 
 #define DEC_PARAM_P(p,f) (dll_ver > DIVX4LINUX ? ((DEC5_PARAM *)p)->f : ((DEC_PARAM *)p)->f)

Index: vd_nuv.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_nuv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vd_nuv.c	7 Jun 2002 09:02:03 -0000	1.3
+++ vd_nuv.c	30 Jun 2002 21:21:07 -0000	1.4
@@ -29,7 +29,7 @@
 {
   if(!(dll_handle=ld_codec(libname,NULL))) return 0;
   decode_nuv_ptr = dlsym(dll_handle,"decode_nuv");
-  return (int)decode_nuv_ptr;
+  return decode_nuv_ptr != NULL;
 }
 
 // to set/get/query special features/parameters

Index: vd_qtrle.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_qtrle.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vd_qtrle.c	7 Jun 2002 09:02:03 -0000	1.3
+++ vd_qtrle.c	30 Jun 2002 21:21:07 -0000	1.4
@@ -32,7 +32,7 @@
 {
   if(!(dll_handle=ld_codec(libname,NULL))) return 0;
   qt_decode_rle_ptr = dlsym(dll_handle,"qt_decode_rle");
-  return (int)qt_decode_rle_ptr;
+  return qt_decode_rle_ptr != NULL;
 }
 
 // to set/get/query special features/parameters

Index: vd_qtrpza.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_qtrpza.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vd_qtrpza.c	7 Jun 2002 09:02:03 -0000	1.3
+++ vd_qtrpza.c	30 Jun 2002 21:21:07 -0000	1.4
@@ -19,12 +19,12 @@
 		    int height, int bytes_per_pixel);
 #define qt_decode_rpza(a,b,c,d,e,f) (*qt_decode_rpza_ptr)(a,b,c,d,e,f)
 
-static void *dll_handle;
+static void *dll_handle;
 static int load_lib( const char *libname )
 {
   if(!(dll_handle=ld_codec(libname,NULL))) return 0;
   qt_decode_rpza_ptr = dlsym(dll_handle,"qt_decode_rpza");
-  return (int)qt_decode_rpza_ptr;
+  return qt_decode_rpza_ptr != NULL;
 }
 
 // to set/get/query special features/parameters

Index: vd_real.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_real.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vd_real.c	9 Jun 2002 14:05:09 -0000	1.1
+++ vd_real.c	30 Jun 2002 21:21:07 -0000	1.2
@@ -131,6 +131,7 @@
 	// setup rv30 codec (codec sub-type and image dimensions):
 	if(extrahdr[1]>=0x30000000){
 	    uint32_t cmsg24[4]={sh->disp_w,sh->disp_h,sh->disp_w,sh->disp_h};
+	    /* FIXME: Broken for 64-bit pointers */
 	    uint32_t cmsg_data[3]={0x24,1+((extrahdr[0]>>16)&7),&cmsg24};
 	    (*rvyuv_custom_message)(cmsg_data,sh->context);
 	}
@@ -151,6 +152,7 @@
 	uint32_t result;
 	int *buff=(unsigned int *)((char*)data+len);
 	uint32_t transform_out[5];
+	/* FIXME: Broken for 64-bit pointers */
 	uint32_t transform_in[6]={
 		len,		// length of the packet (sub-packets appended)
 		0,		// unknown, seems to be unused

Index: vd_xvid.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libmpcodecs/vd_xvid.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vd_xvid.c	7 Jun 2002 09:02:03 -0000	1.2
+++ vd_xvid.c	30 Jun 2002 21:21:07 -0000	1.3
@@ -43,7 +43,7 @@
 {
   if(!(dll_handle=ld_codec(libname,"http://www.xvid.org"))) return 0;
   decore_ptr = dlsym(dll_handle,"decore");
-  return (int)decore_ptr;
+  return decore_ptr != NULL;
 }
 
 // init driver