diff options
author | 2006-12-11 22:37:17 +0000 | |
---|---|---|
committer | 2006-12-11 22:37:17 +0000 | |
commit | d6c8342dc48b29f80d0737273b461bf301753d80 (patch) | |
tree | 987111bb895b415ddef6e0ef45c6aed6ad03eabe | |
parent | 94c6716567fd2dfcf97dc8d7c741f7a590491d70 (diff) |
Mark utf8_get_char parameter as const and fix a compiler warning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21598 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libvo/sub.c | 12 | ||||
-rw-r--r-- | libvo/sub.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index aebba9cbfc..4def27fb32 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -150,22 +150,22 @@ inline static void vo_draw_text_from_buffer(mp_osd_obj_t* obj,void (*draw_alpha) } } -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 --git a/libvo/sub.h b/libvo/sub.h index 2241c86e7a..47d9bb646c 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -125,7 +125,7 @@ void free_osd_list(void); 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> |