[Mplayer-cvslog] CVS: main mplayer.c,1.380,1.381 tvision.c,1.2,1.3

Nick Kurshev nick at mplayer.dev.hu
Thu Jan 31 10:57:15 CET 2002


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

Modified Files:
	mplayer.c tvision.c 
Log Message:
new info for tuning

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- mplayer.c	31 Jan 2002 09:37:11 -0000	1.380
+++ mplayer.c	31 Jan 2002 09:57:13 -0000	1.381
@@ -1346,10 +1346,10 @@
                sh_video->disp_w,sh_video->disp_h,out_fmt,0,
                       fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3) )){
 #else
-   if(video_out->init(sh_video->disp_w,sh_video->disp_h,
+   if(video_out->config(sh_video->disp_w,sh_video->disp_h,
                       screen_size_x,screen_size_y,
                       fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
-                      title,out_fmt)){
+                      title,out_fmt,NULL)){
 #endif
      mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CannotInitVO);
      goto goto_next_file; // exit_player(MSGTR_Exit_error);

Index: tvision.c
===================================================================
RCS file: /cvsroot/mplayer/main/tvision.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tvision.c	10 Nov 2001 23:37:25 -0000	1.2
+++ tvision.c	31 Jan 2002 09:57:13 -0000	1.3
@@ -109,10 +109,12 @@
     gb2.width  = gb1.width;
     gb2.height = gb1.height;
 
-    video_out->init(gb1.width,gb1.height,1024,768,0,0,IMGFMT_YV12);
-//    video_out->init(gb1.width,gb1.height,1024,768,0,0,IMGFMT_UYVY);
-//    video_out->init(gb1.width,gb1.height,1024,768,0,0,IMGFMT_YUY2);
-//    video_out->init(gb1.width,gb1.height,1024,768,0,0,IMGFMT_RGB|24);
+    // video_out->preinit() LOST here ? 
+
+    video_out->config(gb1.width,gb1.height,1024,768,0,0,IMGFMT_YV12,NULL);
+//    video_out->config(gb1.width,gb1.height,1024,768,0,0,IMGFMT_UYVY,NULL);
+//    video_out->config(gb1.width,gb1.height,1024,768,0,0,IMGFMT_YUY2,NULL);
+//    video_out->config(gb1.width,gb1.height,1024,768,0,0,IMGFMT_RGB|24,NULL);
 
     tmpframe=malloc(gb1.width*gb1.height*3/2);
     stride[0]=(gb1.width+15)&(~15);
@@ -178,7 +180,7 @@
       fwrite(map,320*240*2,1,f);
       fclose(f);
     }
-    video_out->init(320,240,800,600,0,0,IMGFMT_YUY2);
+    video_out->config(320,240,800,600,0,0,IMGFMT_YUY2,NULL);
     video_out->draw_frame(count?map1:map2);
     video_out->flip_page();
     




More information about the MPlayer-cvslog mailing list