[MPlayer-cvslog] r21598 - in trunk/libvo: sub.c sub.h

[reimar]

Author: reimar
Date: Mon Dec 11 23:37:17 2006
New Revision: 21598

Modified:
   trunk/libvo/sub.c
   trunk/libvo/sub.h

Log:
Mark utf8_get_char parameter as const and fix a compiler warning


Modified: trunk/libvo/sub.c
==============================================================================
--- trunk/libvo/sub.c	(original)
+++ trunk/libvo/sub.c	Mon Dec 11 23:37:17 2006
@@ -150,22 +150,22 @@
     }
 }
 
-unsigned utf8_get_char(char **str) {
-  uint8_t *strp = (uint8_t *)*str;
+unsigned utf8_get_char(const char **str) {
+  const uint8_t *strp = (const uint8_t *)*str;
   unsigned c;
   GET_UTF8(c, *strp++, goto no_utf8;);
-  *str = (char *)strp;
+  *str = (const char *)strp;
   return c;
 
 no_utf8:
-  strp = (uint8_t *)*str;
+  strp = (const uint8_t *)*str;
   c = *strp++;
-  *str = (char *)strp;
+  *str = (const char *)strp;
   return c;
 }
 
 inline static void vo_update_text_osd(mp_osd_obj_t* obj,int dxs,int dys){
-	unsigned char *cp=vo_osd_text;
+	const char *cp=vo_osd_text;
 	int x=20;
 	int h=0;
 	int font;

Modified: trunk/libvo/sub.h
==============================================================================
--- trunk/libvo/sub.h	(original)
+++ trunk/libvo/sub.h	Mon Dec 11 23:37:17 2006
@@ -125,7 +125,7 @@
 
 extern int vo_osd_changed_flag;
 
-unsigned utf8_get_char(char **str);
+unsigned utf8_get_char(const char **str);
 
 #ifdef USE_DVDNAV
 #include <inttypes.h>