[Mplayer-cvslog] CVS: main/libvo vo_sdl.c,1.56,1.57

[Atmosfear]

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

Modified Files:
	vo_sdl.c 
Log Message:
Fix non-X11 build

Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- vo_sdl.c	10 Oct 2001 01:03:54 -0000	1.56
+++ vo_sdl.c	13 Oct 2001 13:38:59 -0000	1.57
@@ -565,10 +565,18 @@
 	/* calculate new video size/aspect */
 	if(!priv->mode) {
 	if(priv->fulltype&FS) {
+#ifdef HAVE_X11		
 		aspect(&newwidth, &newheight, priv->XWidth ? priv->XWidth : priv->dstwidth, priv->XHeight ? priv->XHeight : priv->dstheight);
+#else		
+		aspect(&newwidth, &newheight, priv->dstwidth, priv->dstheight);
+#endif		
 	} else
 	if(priv->fulltype&VM) {	
+#ifdef HAVE_X11		
 		aspect(&newwidth, &newheight, priv->dstwidth, (int)((float)priv->dstwidth*((float)priv->XHeight / (float)priv->XWidth)));
+#else		
+		aspect(&newwidth, &newheight, priv->dstwidth, priv->dstheight);
+#endif		
 	} else {
 		aspect(&newwidth, &newheight, priv->fullmodes[mode]->w, priv->fullmodes[mode]->h);
 	}
@@ -1085,7 +1093,11 @@
 
 				else if ( keypressed == SDLK_n ) {
 					int newwidth = priv->dstwidth, newheight = priv->dstheight;
+#ifdef HAVE_X11					
 					aspect(&newwidth, &newheight, priv->dstwidth, (int)((float)priv->dstwidth*((float)priv->XHeight / (float)priv->XWidth)));
+#else
+					aspect(&newwidth, &newheight, priv->dstwidth, priv->dstheight);
+#endif					
 					if (priv->surface->w != newwidth || priv->surface->h != newheight) {
 						priv->surface = SDL_SetVideoMode(newwidth, newheight, priv->bpp, priv->sdlflags);
 					    	priv->windowsize.w = priv->surface->w;