summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-02-01 08:42:52 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-02-01 08:42:52 +0000
commitc3d9e714f86e24a1b4120d1d5a5c6afeb8e1aefb (patch)
tree2fb388deaf12d202aba85e20b7ea42d48560bbbb /Gui
parent3358c64749db84713d72277130fb8a01d9e0a41a (diff)
downloadmpv-c3d9e714f86e24a1b4120d1d5a5c6afeb8e1aefb.tar.bz2
mpv-c3d9e714f86e24a1b4120d1d5a5c6afeb8e1aefb.tar.xz
commit Dominik Mierzejewski's patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9191 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/bitmap.h5
-rw-r--r--Gui/mplayer/gtk/fs.c2
-rw-r--r--Gui/mplayer/play.c1
3 files changed, 5 insertions, 3 deletions
diff --git a/Gui/bitmap.h b/Gui/bitmap.h
index 84f671037c..ce8bbaed3c 100644
--- a/Gui/bitmap.h
+++ b/Gui/bitmap.h
@@ -1,11 +1,10 @@
-
#ifndef __MYSAMPLE
#define __MYSAMPLE
typedef struct _txSample
{
- unsigned int Width;
- unsigned int Height;
+ unsigned long Width;
+ unsigned long Height;
unsigned int BPP;
unsigned long ImageSize;
char * Image;
diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c
index 427445c0a6..e59a6fa6f5 100644
--- a/Gui/mplayer/gtk/fs.c
+++ b/Gui/mplayer/gtk/fs.c
@@ -221,6 +221,8 @@ void CheckDir( GtkWidget * list,char * directory )
gtk_widget_show( list );
}
+int fs_PersistantHistory( char *subject ); /* forward declaration */
+
void ShowFileSelect( int type,int modal )
{
int i;
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index 6c11d9204a..79d85e2333 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -8,6 +8,7 @@
#include <signal.h>
#include "../wm/ws.h"
+#include "../wm/wsxdnd.h"
#include "../../config.h"
#include "../../help_mp.h"
#include "../../mplayer.h"