Commit ac497006 authored by Rémi Duraffort's avatar Rémi Duraffort

aa: fix compilation (collision with Xlib symbols).

parent d6d738ce
...@@ -67,7 +67,7 @@ vlc_module_end() ...@@ -67,7 +67,7 @@ vlc_module_end()
*****************************************************************************/ *****************************************************************************/
static picture_pool_t *Pool (vout_display_t *, unsigned); static picture_pool_t *Pool (vout_display_t *, unsigned);
static void Prepare(vout_display_t *, picture_t *); static void Prepare(vout_display_t *, picture_t *);
static void Display(vout_display_t *, picture_t *); static void PictureDisplay(vout_display_t *, picture_t *);
static int Control(vout_display_t *, int, va_list); static int Control(vout_display_t *, int, va_list);
/* */ /* */
...@@ -130,7 +130,7 @@ static int Open(vlc_object_t *object) ...@@ -130,7 +130,7 @@ static int Open(vlc_object_t *object)
vd->pool = Pool; vd->pool = Pool;
vd->prepare = Prepare; vd->prepare = Prepare;
vd->display = Display; vd->display = PictureDisplay;
vd->control = Control; vd->control = Control;
vd->manage = Manage; vd->manage = Manage;
...@@ -216,7 +216,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture) ...@@ -216,7 +216,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture)
/** /**
* Display a picture * Display a picture
*/ */
static void Display(vout_display_t *vd, picture_t *picture) static void PictureDisplay(vout_display_t *vd, picture_t *picture)
{ {
vout_display_sys_t *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment