[MPlayer-cvslog] r28795 - in trunk: cfg-mplayer.h libvo/video_out.c libvo/video_out.h

[reimar]

Author: reimar
Date: Mon Mar  2 12:24:20 2009
New Revision: 28795

Log:
Make WinID a 64 bit integer, this should avoid issues with valid Window
handles on windows being interpreted as "no wid set".

Modified:
   trunk/cfg-mplayer.h
   trunk/libvo/video_out.c
   trunk/libvo/video_out.h

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Mon Mar  2 12:17:50 2009	(r28794)
+++ trunk/cfg-mplayer.h	Mon Mar  2 12:24:20 2009	(r28795)
@@ -199,7 +199,7 @@ const m_option_t mplayer_opts[]={
 	
     {"adapter", &vo_adapter_num, CONF_TYPE_INT, CONF_RANGE, 0, 5, NULL},
     {"refreshrate",&vo_refresh_rate,CONF_TYPE_INT,CONF_RANGE, 0,100, NULL},
-	{"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL},
+	{"wid", &WinID, CONF_TYPE_INT64, 0, 0, 0, NULL},
 #ifdef CONFIG_X11
 	// x11,xv,xmga,xvidix
 	{"icelayer", "-icelayer has been removed. Use -fstype layer:<number> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},

Modified: trunk/libvo/video_out.c
==============================================================================
--- trunk/libvo/video_out.c	Mon Mar  2 12:17:50 2009	(r28794)
+++ trunk/libvo/video_out.c	Mon Mar  2 12:24:20 2009	(r28795)
@@ -68,7 +68,7 @@ int vo_refresh_rate=0;
 int vo_keepaspect=1;
 int vo_rootwin=0;
 int vo_border=1;
-int WinID = -1;
+int64_t WinID = -1;
 
 int vo_pts=0; // for hw decoding
 float vo_fps=0;

Modified: trunk/libvo/video_out.h
==============================================================================
--- trunk/libvo/video_out.h	Mon Mar  2 12:17:50 2009	(r28794)
+++ trunk/libvo/video_out.h	Mon Mar  2 12:24:20 2009	(r28795)
@@ -250,7 +250,7 @@ extern char *vo_subdevice;
 
 extern int vo_colorkey;
 
-extern int WinID;
+extern int64_t WinID;
 
 typedef struct {
         float min;