[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.65,1.66

[Michael Niedermayer]

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

Modified Files:
	vo_x11.c 
Log Message:
default is allways nozoom again (specify -zoom if u want the sane behavior)
call freeSwsContext() on uninit()


Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- vo_x11.c	11 Feb 2002 14:04:31 -0000	1.65
+++ vo_x11.c	12 Feb 2002 17:55:03 -0000	1.66
@@ -266,7 +266,7 @@
  if( flags&0x02 ) vm = 1;
  if( flags&0x08 ) Flip_Flag = 1;
  zoomFlag = flags&0x04;
- if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode
+// if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode
  
 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight );
 
@@ -278,8 +278,8 @@
 
  /* set image size, if zoom is on it will be changed during draw_slice anyway 
     so we dont dupplicate the aspect code here */
- image_width=d_width;
- image_height=d_height;
+ image_width=width;
+ image_height=height;
 
  aspect= ((1<<16)*d_width + d_height/2)/d_height;
 
@@ -565,6 +565,8 @@
 #endif
 
  vo_x11_uninit(mDisplay, mywindow);
+
+ freeSwsContext(swsContext);
 }
 
 static uint32_t preinit(const char *arg)