Move OSD and TLS to instance.

[vlc] / src / osd / osd_text.c

diff --git a/src/osd/osd_text.c b/src/osd/osd_text.c
index 39cf6d1d5bb59ca4960c0f8663d4b36fb9f946e5..1e9490b83c19aae64549978885b2d7d15e8d8611 100644 (file)
--- a/src/osd/osd_text.c
+++ b/src/osd/osd_text.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * osd_text.c : text manipulation functions
  *****************************************************************************
- * Copyright (C) 1999-2005 the VideoLAN team
+ * Copyright (C) 1999-2007 the VideoLAN team
  * $Id$
  *
  * Author: Sigmund Augdal Helberg <dnumgis@videolan.org>
@@ -20,8 +20,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
- 
-#include <vlc/vout.h>
+#include <vlc/vlc.h>
+#include <vlc_vout.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>
 #include <vlc_osd.h>
@@ -70,6 +70,7 @@ int osd_ShowTextAbsolute( spu_t *p_spu_channel, int i_channel,
 {
     subpicture_t *p_spu;
     video_format_t fmt;
+    (void)p_style;
 
     if( !psz_string ) return VLC_EGENERIC;