summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-05-04 03:01:51 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-08-29 20:18:03 +0300
commit7ef7333e5990e5714719d89fa5fdf890beb76e16 (patch)
tree68d3c0e0d5498c8fd94e1feaff36c972767cd6f3 /libvo
parentf48840f8204d754026350c046b5b0ab03a9c8b80 (diff)
downloadmpv-7ef7333e5990e5714719d89fa5fdf890beb76e16.tar.bz2
mpv-7ef7333e5990e5714719d89fa5fdf890beb76e16.tar.xz
vo_vdpau: Delete GUI stuff, include font_load.h for force_load_font
font_load.h was previously included through gui/interface.h
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_vdpau.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index e0a2c40de0..532ba67795 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -46,7 +46,7 @@
#include "libavcodec/vdpau.h"
-#include "gui/interface.h"
+#include "font_load.h"
#include "libavutil/common.h"
#include "libavutil/mathematics.h"
@@ -555,11 +555,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
visible_buf = 0;
-#ifdef CONFIG_GUI
- if (use_gui)
- guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize our window
- else
-#endif
{
#ifdef CONFIG_XF86VM
if (vm)
@@ -1196,8 +1191,6 @@ static int control(uint32_t request, void *data)
return get_image(data);
case VOCTRL_DRAW_IMAGE:
return draw_image(data);
- case VOCTRL_GUISUPPORT:
- return VO_TRUE;
case VOCTRL_BORDER:
vo_x11_border();
resize();