# HG changeset patch # User reimar # Date 1165876637 0 # Node ID 239f2c145b2f64f81e122ff9ff762ff2d2ae9397 # Parent 37c795807a1d4867e6d332ac7db0953e3bf81dc0 Mark utf8_get_char parameter as const and fix a compiler warning diff -r 37c795807a1d -r 239f2c145b2f libvo/sub.c --- a/libvo/sub.c Mon Dec 11 22:32:13 2006 +0000 +++ b/libvo/sub.c Mon Dec 11 22:37:17 2006 +0000 @@ -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; diff -r 37c795807a1d -r 239f2c145b2f libvo/sub.h --- a/libvo/sub.h Mon Dec 11 22:32:13 2006 +0000 +++ b/libvo/sub.h Mon Dec 11 22:37:17 2006 +0000 @@ -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