[vlc-commits] commit: aa: fix compilation (collision with Xlib symbols). ( Rémi Duraffort )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Jul 15 18:55:36 2010 +0200| [ee9197a197859949b9c3f209f3ed7fd3d5ab614e] | committer: Rémi Duraffort 

aa: fix compilation (collision with Xlib symbols).
(cherry picked from commit ac49700607b46e824d93671722c8442aad409a6a)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=ee9197a197859949b9c3f209f3ed7fd3d5ab614e
---

 modules/video_output/aa.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
index fe816ad..753f334 100644
--- a/modules/video_output/aa.c
+++ b/modules/video_output/aa.c
@@ -68,7 +68,7 @@ vlc_module_end()
  *****************************************************************************/
 static picture_pool_t *Pool   (vout_display_t *, unsigned);
 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);
 
 /* */
@@ -131,7 +131,7 @@ static int Open(vlc_object_t *object)
 
     vd->pool    = Pool;
     vd->prepare = Prepare;
-    vd->display = Display;
+    vd->display = PictureDisplay;
     vd->control = Control;
     vd->manage  = Manage;
 
@@ -219,7 +219,7 @@ static void Prepare(vout_display_t *vd, picture_t *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;