# HG changeset patch
# User michael
# Date 1013536503 0
# Node ID 305a0c20bde4321c4f3661810a90de54bb027499
# Parent  f6a2d81c52ac1afb7b56883031fd169a6ffbf23d
default is allways nozoom again (specify -zoom if u want the sane behavior)
call freeSwsContext() on uninit()

diff -r f6a2d81c52ac -r 305a0c20bde4 libvo/vo_x11.c
--- a/libvo/vo_x11.c	Tue Feb 12 17:52:30 2002 +0000
+++ b/libvo/vo_x11.c	Tue Feb 12 17:55:03 2002 +0000
@@ -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)