android_window: check subtitles bounds

[vlc] / modules / access / vcdx / info.h

diff --git a/modules/access/vcdx/info.h b/modules/access/vcdx/info.h
index a5f60b3b6ac560dbb26b3cee3e478c4ecef80926..8e820b6177ca041e204993281a1d9501ab977193 100644 (file)
--- a/modules/access/vcdx/info.h
+++ b/modules/access/vcdx/info.h
@@ -1,24 +1,24 @@
 /*****************************************************************************
  * info.h : VCD information routine headers
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN (Centrale Réseaux) and its contributors
- * $Id: info.h 8606 2004-08-31 18:32:54Z rocky $
+ * Copyright (C) 2004 VLC authors and VideoLAN
+ * $Id$
  *
  * Authors: Rocky Bernstein <rocky@panix.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VCD_INFO_H
@@ -27,14 +27,17 @@
 #include "vcdplayer.h"
 
 /*
- Sets VCD meta information and navigation/playlist entries. 
+ Sets VCD meta information and navigation/playlist entries.
  */
 void VCDMetaInfo( access_t *p_access, /*const*/ char *psz_mrl );
 
 
-char * VCDFormatStr(const access_t *p_access, vcdplayer_t *p_vcdplayer,
-                   const char format_str[], const char *mrl,
-                   const vcdinfo_itemid_t *itemid);
+#if 0
+char * VCDFormatStr(vcdplayer_t *p_vcdplayer,
+            const char *format_str, const char *mrl,
+            const vcdinfo_itemid_t *itemid);
+#endif
+
 
 void VCDUpdateTitle( access_t *p_access );