summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-20 04:00:25 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-20 04:00:25 +0000
commitd07b369a494199ce54670b3d7a306bc9ca17a334 (patch)
treed6b1efc718a2720ea7dfed1380bb8133a232d1e0
parent46914c149841e3aa82c7ef5b38988a9d7ec6cb00 (diff)
downloadmpv-d07b369a494199ce54670b3d7a306bc9ca17a334.tar.bz2
mpv-d07b369a494199ce54670b3d7a306bc9ca17a334.tar.xz
64bit incompatibility bug, patch by Artur Grabowski <art@blahonga.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6141 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/x11_common.c3
-rw-r--r--postproc/yuv2rgb.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index a572560e6c..b69d8d3c78 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -594,10 +594,11 @@ int vo_x11_check_events(Display *mydisplay){
{
Window root;
int foo;
+ Window win;
XGetGeometry(mydisplay, vo_window, &root, &foo, &foo,
&foo/*width*/, &foo/*height*/, &foo, &foo);
XTranslateCoordinates(mydisplay, vo_window, root, 0, 0,
- &vo_dx, &vo_dy, (Window *)&foo);
+ &vo_dx, &vo_dy, &win);
}
#endif
ret|=VO_EVENT_RESIZE;
diff --git a/postproc/yuv2rgb.c b/postproc/yuv2rgb.c
index ac5f8b7e91..10db46f467 100644
--- a/postproc/yuv2rgb.c
+++ b/postproc/yuv2rgb.c
@@ -407,7 +407,7 @@ static void yuv2rgb_c_init (int bpp, int mode)
uint32_t *table_32 = 0;
uint16_t *table_16 = 0;
uint8_t *table_8 = 0;
- uint32_t entry_size = 0;
+ int entry_size = 0;
void *table_r = 0, *table_g = 0, *table_b = 0;
int crv = Inverse_Table_6_9[matrix_coefficients][0];