From ba47a8161c17196ad8e27e96c396f2e0083edb07 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Thu, 29 Jul 2010 20:53:14 +0100
Subject: Spelling fixes.

Source: informational messages generated by lintian.
---
 src/video_out/video_out_opengl.c | 2 +-
 src/video_out/video_out_syncfb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/video_out')

diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 648cd38c5..76040f623 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -955,7 +955,7 @@ static int render_setup_fp_yuv (opengl_driver_t *this) {
   glGetIntegerv             (MYGL_PROGRAM_ERROR_POSITION_ARB, &errorpos);
   if (errorpos != -1)
     xprintf (this->xine, XINE_VERBOSITY_NONE,
-	     "video_out_opengl: fragprog_yuv errorpos %d begining with '%.20s'. Ask a wizard.\n",
+	     "video_out_opengl: fragprog_yuv errorpos %d beginning with '%.20s'. Ask a wizard.\n",
 	     errorpos, fragprog_yuv+errorpos);
 
   glEnable (MYGL_FRAGMENT_PROGRAM_ARB);
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index aaf7d43c7..b3385a943 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -996,7 +996,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
      xprintf(this->xine, XINE_VERBOSITY_LOG,
 	     _("video_out_syncfb: info. (brightness/contrast control won\'t be available because "
 	       "your SyncFB kernel module seems to be outdated. Please refer to README."
-	       "syncfb for informations on how to update it.)\n"));
+	       "syncfb for information on how to update it.)\n"));
    }
 
   /* check for virtual screen size and screen depth - this is rather important
-- 
cgit v1.2.3


From 714cab339b43166682cc2bc297f9ba2b3c9f9edd Mon Sep 17 00:00:00 2001
From: Geoff Leach <gl@cs.rmit.edu.au>
Date: Mon, 16 Aug 2010 12:02:55 +0000
Subject: Fix building with recent videoproto

---
 src/video_out/xxmc.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/video_out')

diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h
index 6110978d1..bc9ceb3ef 100644
--- a/src/video_out/xxmc.h
+++ b/src/video_out/xxmc.h
@@ -77,11 +77,9 @@
 #include <X11/extensions/XShm.h>
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvlib.h>
+#include <X11/extensions/XvMClib.h>
 #ifdef HAVE_VLDXVMC
   #include <X11/extensions/vldXvMC.h>
-#else
-  #include <X11/extensions/XvMClib.h>
-  #include <X11/extensions/XvMC.h>
 #endif
 
 #define LOG_MODULE "video_out_xxmc"
-- 
cgit v1.2.3