[Mplayer-cvslog] CVS: main/libmpcodecs vd.c,1.19,1.20

[Arpi of Ize]

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

Modified Files:
	vd.c 
Log Message:
libvo printfs added (moved from mplayer.c), mpi buffers free'd to fix multifile playback

Index: vd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vd.c	16 Mar 2002 02:46:49 -0000	1.19
+++ vd.c	17 Mar 2002 02:30:29 -0000	1.20
@@ -103,6 +103,11 @@
 
 static vo_tune_info_t vtune;
 
+static mp_image_t* static_images[2];
+static mp_image_t* temp_images[1];
+static mp_image_t* export_images[1];
+static int static_idx=0;
+
 int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outfmt){
     int i,j;
     unsigned int out_fmt=0;
@@ -182,6 +187,21 @@
     }
   }
 
+  { const vo_info_t *info = video_out->get_info();
+    mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",info->short_name,
+         sh->disp_w,sh->disp_h,
+         screen_size_x,screen_size_y,
+	 vo_format_name(out_fmt),
+         fullscreen?"fs ":"",
+         vidmode?"vm ":"",
+         softzoom?"zoom ":"",
+         (flip==1)?"flip ":"");
+    mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name);
+    mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author);
+    if(info->comment && strlen(info->comment) > 0)
+        mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment);
+  }
+
     // Time to config libvo!
     mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
                       sh->disp_w,sh->disp_h,
@@ -198,13 +218,14 @@
 	return 0; // exit_player(MSGTR_Exit_error);
     }
 
+#define FREE_MPI(mpi) if(mpi){if(mpi->flags&MP_IMGFLAG_ALLOCATED) free(mpi->planes[0]); free(mpi); mpi=NULL;}
+    FREE_MPI(static_images[0])
+    FREE_MPI(static_images[1])
+    FREE_MPI(temp_images[0])
+    FREE_MPI(export_images[0])
+#undef FREE_MPI
     return 1;
 }
-
-static mp_image_t* static_images[2];
-static mp_image_t* temp_images[1];
-static mp_image_t* export_images[1];
-static int static_idx=0;
 
 // mp_imgtype: buffering type, see mp_image.h
 // mp_imgflag: buffer requirements (read/write, preserve, stride limits), see mp_image.h