Mercurial > mplayer.hg

changeset 28760:dec2bc0855e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make WinID a 64 bit integer, this should avoid issues with valid Window handles on windows being interpreted as "no wid set".
author reimar
date Mon, 02 Mar 2009 11:24:20 +0000
parents af274aef6b81
children 647c588d282c
files cfg-mplayer.h libvo/video_out.c libvo/video_out.h
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-mplayer.h	Mon Mar 02 11:17:50 2009 +0000
+++ b/cfg-mplayer.h	Mon Mar 02 11:24:20 2009 +0000
@@ -199,7 +199,7 @@
 	
     {"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},
--- a/libvo/video_out.c	Mon Mar 02 11:17:50 2009 +0000
+++ b/libvo/video_out.c	Mon Mar 02 11:24:20 2009 +0000
@@ -68,7 +68,7 @@
 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;
--- a/libvo/video_out.h	Mon Mar 02 11:17:50 2009 +0000
+++ b/libvo/video_out.h	Mon Mar 02 11:24:20 2009 +0000
@@ -250,7 +250,7 @@
 
 extern int vo_colorkey;
 
-extern int WinID;
+extern int64_t WinID;
 
 typedef struct {
         float min;