comparison libvo/vo_x11.c @ 4815:178b524e5213

Bugfix in x11_common.c mainly. Don't screw up the display name, don't forget to close the display (vo_xv) and to reset vo_depthonscreen when we have destroyed the window and closed the display !!!!! Open the display before using it (vo_x11) !!!

4814:23abc0e262e3

 unsigned int modeline_width, modeline_height;
 static uint32_t vm_width;
 static uint32_t vm_height;
#endif

 if (!title)
    title = strdup("MPlayer X11 (XImage/Shm) render");

 in_format=format;
 srcW= width;

#ifdef HAVE_NEW_GUI
 if ( vo_window == None )
#endif   
   {
    if( !vo_init() ) return 0; // Can't open X11

    hint.x=0;
    hint.y=0;
    if(zoomFlag){
	hint.width=d_width;
	hint.height=d_height;

      return draw_slice(src, stride, srcW, srcH, 0, 0);
}

static uint32_t query_format( uint32_t format )
{
 if( !vo_init() ) return 0; // Can't open X11

 switch( format )
  {
   case IMGFMT_BGR15:
   case IMGFMT_BGR16:

4815:178b524e5213

 unsigned int modeline_width, modeline_height;
 static uint32_t vm_width;
 static uint32_t vm_height;
#endif

#ifdef HAVE_NEW_GUI
 if ( vo_window == None )
#endif   
    if( !vo_init() ) return 0; // Can't open X11


 if (!title)
    title = strdup("MPlayer X11 (XImage/Shm) render");

 in_format=format;
 srcW= width;

#ifdef HAVE_NEW_GUI
 if ( vo_window == None )
#endif   
   {
    hint.x=0;
    hint.y=0;
    if(zoomFlag){
	hint.width=d_width;
	hint.height=d_height;

      return draw_slice(src, stride, srcW, srcH, 0, 0);
}

static uint32_t query_format( uint32_t format )
{
  //if( !vo_init() ) return 0; // Can't open X11

 switch( format )
  {
   case IMGFMT_BGR15:
   case IMGFMT_BGR16: