[Mplayer-cvslog] CVS: main/libmpcodecs vd_vfw.c,1.20,1.21 ve_vfw.c,1.9,1.10

Alex Beregszaszi alex at mplayerhq.hu
Fri Sep 13 23:55:58 CEST 2002


Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv28459

Modified Files:
	vd_vfw.c ve_vfw.c 
Log Message:
fixed to comply with new loader

Index: vd_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_vfw.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vd_vfw.c	4 Sep 2002 23:17:53 -0000	1.20
+++ vd_vfw.c	13 Sep 2002 21:55:55 -0000	1.21
@@ -156,9 +156,11 @@
 
     mp_msg(MSGT_WIN32,MSGL_V,"======= Win32 (VFW) VIDEO Codec init =======\n");
 
-    win32_codec_name = sh->codec->dll;
+
+//    win32_codec_name = sh->codec->dll;
 //    sh->hic = ICOpen( 0x63646976, sh->bih->biCompression, ICMODE_FASTDECOMPRESS);
-    priv->handle = ICOpen( 0x63646976, sh->bih->biCompression, ICMODE_DECOMPRESS);
+//    priv->handle = ICOpen( 0x63646976, sh->bih->biCompression, ICMODE_DECOMPRESS);
+    priv->handle = ICOpen( sh->codec->dll, sh->bih->biCompression, ICMODE_DECOMPRESS);
     if(!priv->handle){
 	mp_msg(MSGT_WIN32,MSGL_ERR,"ICOpen failed! unknown codec / wrong parameters?\n");
 	return 0;
@@ -301,7 +303,7 @@
     priv->o_bih->biWidth=mpi->width; //mpi->stride[0]/(mpi->bpp/8);
 
     sh->bih->biSizeImage = len;
-    
+
 #ifdef BUILD_VFWEX
     ret = ICDecompressEx(priv->handle, 
 #else

Index: ve_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_vfw.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ve_vfw.c	10 Sep 2002 22:18:32 -0000	1.9
+++ ve_vfw.c	13 Sep 2002 21:55:55 -0000	1.10
@@ -61,8 +61,8 @@
 //  memset(&sh_video->o_bih, 0, sizeof(BITMAPINFOHEADER));
 //  output_bih->biSize = sizeof(BITMAPINFOHEADER);
 
-  win32_codec_name = dll_name;
-  encoder_hic = ICOpen( 0x63646976, out_fourcc, ICMODE_COMPRESS);
+//  encoder_hic = ICOpen( 0x63646976, out_fourcc, ICMODE_COMPRESS);
+    encoder_hic = ICOpen( dll_name, out_fourcc, ICMODE_COMPRESS);
   if(!encoder_hic){
     mp_msg(MSGT_WIN32,MSGL_ERR,"ICOpen failed! unknown codec / wrong parameters?\n");
     return NULL;




More information about the MPlayer-cvslog mailing list