comparison libvo/vo_x11.c @ 4677:305a0c20bde4

default is allways nozoom again (specify -zoom if u want the sane behavior) call freeSwsContext() on uninit()

4676:f6a2d81c52ac

 
 if( flags&0x03 ) fullscreen = 1;
 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
 
//printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight );

 XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs );
 depth=attribs.depth;

 if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) depth=24;
 XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );

 /* 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;

 aspect= ((1<<16)*d_width + d_height/2)/d_height;

#ifdef HAVE_NEW_GUI
 if ( vo_window != None ) { mywindow=vo_window; mygc=vo_gc; }

#ifdef HAVE_XF86VM
 vo_vm_close(mDisplay);
#endif

 vo_x11_uninit(mDisplay, mywindow);
}

static uint32_t preinit(const char *arg)
{
  return 0;

4677:305a0c20bde4

 
 if( flags&0x03 ) fullscreen = 1;
 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
 
//printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight );

 XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs );
 depth=attribs.depth;

 if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) depth=24;
 XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );

 /* 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=width;
 image_height=height;

 aspect= ((1<<16)*d_width + d_height/2)/d_height;

#ifdef HAVE_NEW_GUI
 if ( vo_window != None ) { mywindow=vo_window; mygc=vo_gc; }

#ifdef HAVE_XF86VM
 vo_vm_close(mDisplay);
#endif

 vo_x11_uninit(mDisplay, mywindow);

 freeSwsContext(swsContext);
}

static uint32_t preinit(const char *arg)
{
  return 0;