[Mplayer-cvslog] CVS: main/libmpcodecs vd.c,1.17,1.18

Arpi of Ize arpi at mplayer.dev.hu
Fri Mar 15 00:58:49 CET 2002


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

Modified Files:
	vd.c 
Log Message:
temp workaround for mencoder

Index: vd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vd.c	14 Mar 2002 23:28:51 -0000	1.17
+++ vd.c	14 Mar 2002 23:58:46 -0000	1.18
@@ -110,11 +110,11 @@
     int screen_size_y=0;//SCREEN_SIZE_Y;
     vo_functions_t* video_out=sh->video_out;
 
-    memset(&vtune,0,sizeof(vo_tune_info_t));
-
     mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDec: vo config request - %d x %d, %s  \n",
 	w,h,vo_format_name(preferred_outfmt));
 
+    if(!video_out) return 1; // temp hack
+
     // check if libvo and codec has common outfmt:
     for(i=0;i<CODECS_MAX_OUTFMT;i++){
 	out_fmt=sh->codec->outfmt[i];
@@ -186,6 +186,7 @@
                       fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
                       "MPlayer",out_fmt);
 
+    memset(&vtune,0,sizeof(vo_tune_info_t));
     if(video_out->config(sh->disp_w,sh->disp_h,
                       screen_size_x,screen_size_y,
                       fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),




More information about the MPlayer-cvslog mailing list