[Mplayer-cvslog] CVS: main mencoder.c,1.85,1.86 dll_init.h,1.3,1.4 dll_init.c,1.39,1.40

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv5872

Modified Files:
	mencoder.c dll_init.h dll_init.c 
Log Message:
div3/vfw encoding fixed

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- mencoder.c	10 Feb 2002 00:55:10 -0000	1.85
+++ mencoder.c	10 Feb 2002 12:20:50 -0000	1.86
@@ -761,12 +761,12 @@
     vfw_bih->biSize=sizeof(BITMAPINFOHEADER);
     vfw_bih->biWidth=vo_w;
     vfw_bih->biHeight=vo_h;
-    vfw_bih->biPlanes=0;
+    vfw_bih->biPlanes=1;
     vfw_bih->biBitCount=24;
     vfw_bih->biCompression=0;
     vfw_bih->biSizeImage=vo_w*vo_h*((vfw_bih->biBitCount+7)/8);
-//    mux_v->bih=vfw_open_encoder("divxc32.dll",vfw_bih);
-    mux_v->bih=vfw_open_encoder("AvidAVICodec.dll",vfw_bih);
+//    mux_v->bih=vfw_open_encoder("divxc32.dll",vfw_bih,mmioFOURCC('D', 'I', 'V', '3'));
+    mux_v->bih=vfw_open_encoder("AvidAVICodec.dll",vfw_bih, 0);
     break;
 #else
     printf("No support for Win32/VfW codecs compiled in\n");

Index: dll_init.h
===================================================================
RCS file: /cvsroot/mplayer/main/dll_init.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dll_init.h	7 Feb 2002 20:20:14 -0000	1.3
+++ dll_init.h	10 Feb 2002 12:20:50 -0000	1.4
@@ -10,7 +10,7 @@
 int vfw_decode_video(sh_video_t* sh_video,void* start,int in_size,int drop_frame,int ex);
 int vfw_set_postproc(sh_video_t* sh_video,int quality);
 
-BITMAPINFOHEADER* vfw_open_encoder(char *dll_name, BITMAPINFOHEADER *input_bih);
+BITMAPINFOHEADER* vfw_open_encoder(char *dll_name, BITMAPINFOHEADER *input_bih,unsigned int out_fourcc);
 int vfw_encode_frame(BITMAPINFOHEADER* biOutput,void* OutBuf,
 		     BITMAPINFOHEADER* biInput,void* Image,
 		     long* keyframe, int quality);

Index: dll_init.c
===================================================================
RCS file: /cvsroot/mplayer/main/dll_init.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- dll_init.c	7 Feb 2002 20:20:14 -0000	1.39
+++ dll_init.c	10 Feb 2002 12:20:50 -0000	1.40
@@ -420,7 +420,7 @@
 static int encoder_frameno=0;
 
 //int init_vfw_encoder(char *dll_name, BITMAPINFOHEADER *input_bih, BITMAPINFOHEADER *output_bih)
-BITMAPINFOHEADER* vfw_open_encoder(char *dll_name, BITMAPINFOHEADER *input_bih)
+BITMAPINFOHEADER* vfw_open_encoder(char *dll_name, BITMAPINFOHEADER *input_bih,unsigned int out_fourcc)
 {
 //  sh_video_t *sh_video;
   HRESULT ret;
@@ -440,7 +440,7 @@
 //  output_bih->biSize = sizeof(BITMAPINFOHEADER);
 
   win32_codec_name = dll_name;
-  encoder_hic = ICOpen( 0x63646976, 0, ICMODE_COMPRESS);
+  encoder_hic = ICOpen( 0x63646976, out_fourcc, ICMODE_COMPRESS);
   if(!encoder_hic){
     mp_msg(MSGT_WIN32,MSGL_ERR,"ICOpen failed! unknown codec / wrong parameters?\n");
     return NULL;