summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-02 11:24:20 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-02 11:24:20 +0000
commit8864662b13e9f621209d7b92d763a0641b6907ef (patch)
tree2f062fe479b4339f24f8d4b6da659edd7a8d4258
parent39bb720ef8418d1c0db87b773f5467b16b395d96 (diff)
downloadmpv-8864662b13e9f621209d7b92d763a0641b6907ef.tar.bz2
mpv-8864662b13e9f621209d7b92d763a0641b6907ef.tar.xz
Make WinID a 64 bit integer, this should avoid issues with valid Window
handles on windows being interpreted as "no wid set". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28795 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--cfg-mplayer.h2
-rw-r--r--libvo/video_out.c2
-rw-r--r--libvo/video_out.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 3cb810614f..ddd4fe841a 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -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},
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 69d6992210..05d2291d05 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -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;
diff --git a/libvo/video_out.h b/libvo/video_out.h
index 7c56231d41..f90123ddee 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -250,7 +250,7 @@ extern char *vo_subdevice;
extern int vo_colorkey;
-extern int WinID;
+extern int64_t WinID;
typedef struct {
float min;