diff -NpuBr -Xexclude.txt main/libavformat/avformat.h sherpya/libavformat/avformat.h
--- main/libavformat/avformat.h	2010-07-29 14:54:42.750000000 +0200
+++ sherpya/libavformat/avformat.h	2010-07-29 15:17:08.109375000 +0200
@@ -1437,7 +1437,7 @@ int find_info_tag(char *arg, int arg_siz
  * @param number frame number
  * @return 0 if OK, -1 on format error
  */
-int av_get_frame_filename(char *buf, int buf_size,
+int av_get_frame_filename(unsigned char *buf, int buf_size,
                           const char *path, int number);
 
 /**
diff -NpuBr -Xexclude.txt main/libavformat/cutils.c sherpya/libavformat/cutils.c
--- main/libavformat/cutils.c	2010-04-12 00:58:32.921875000 +0200
+++ sherpya/libavformat/cutils.c	2010-07-29 15:17:08.125000000 +0200
@@ -107,7 +107,7 @@ static int date_get_num(const char **pp,
     val = 0;
     for(i = 0; i < len_max; i++) {
         c = *p;
-        if (!isdigit(c))
+        if (!isdigit((unsigned char) c))
             break;
         val = (val * 10) + c - '0';
         p++;
diff -NpuBr -Xexclude.txt main/libavformat/http.c sherpya/libavformat/http.c
--- main/libavformat/http.c	2010-07-29 14:54:42.765625000 +0200
+++ sherpya/libavformat/http.c	2010-07-29 15:28:00.156250000 +0200
@@ -210,7 +210,7 @@ static int process_line(URLContext *h, c
                         int *new_location)
 {
     HTTPContext *s = h->priv_data;
-    char *tag, *p, *end;
+    unsigned char *tag, *p, *end;
 
     /* end of header */
     if (line[0] == '\0')
diff -NpuBr -Xexclude.txt main/libavformat/utils.c sherpya/libavformat/utils.c
--- main/libavformat/utils.c	2010-07-29 14:54:42.765625000 +0200
+++ sherpya/libavformat/utils.c	2010-07-29 15:17:08.156250000 +0200
@@ -3213,7 +3213,7 @@ uint64_t ff_ntp_time(void)
 
 int64_t parse_date(const char *datestr, int duration)
 {
-    const char *p;
+    const unsigned char *p;
     int64_t t;
     struct tm dt;
     int i;
@@ -3225,7 +3225,7 @@ int64_t parse_date(const char *datestr,
         "%H:%M:%S",
         "%H%M%S",
     };
-    const char *q;
+    const unsigned char *q;
     int is_utc, len;
     char lastch;
     int negative = 0;
@@ -3369,11 +3369,11 @@ int find_info_tag(char *arg, int arg_siz
     return 0;
 }
 
-int av_get_frame_filename(char *buf, int buf_size,
+int av_get_frame_filename(unsigned char *buf, int buf_size,
                           const char *path, int number)
 {
-    const char *p;
-    char *q, buf1[20], c;
+    const unsigned char *p;
+    unsigned char *q, buf1[20], c;
     int nd, len, percentd_found;
 
     q = buf;
diff -NpuBr -Xexclude.txt main/libavutil/eval.c sherpya/libavutil/eval.c
--- main/libavutil/eval.c	2010-06-24 22:19:01.015625000 +0200
+++ sherpya/libavutil/eval.c	2010-07-29 15:17:08.171875000 +0200
@@ -455,7 +455,7 @@ int av_parse_expr(AVExpr **expr, const c
         return AVERROR(ENOMEM);
 
     while (*s)
-        if (!isspace(*s++)) *wp++ = s[-1];
+        if (!isspace((unsigned char) *s++)) *wp++ = s[-1];
     *wp++ = 0;
 
     p.class      = &class;
diff -NpuBr -Xexclude.txt main/libmpdemux/mf.c sherpya/libmpdemux/mf.c
--- main/libmpdemux/mf.c	2010-02-21 04:21:39.687500000 +0100
+++ sherpya/libmpdemux/mf.c	2010-07-29 15:17:08.171875000 +0200
@@ -67,7 +67,7 @@ mf_t* open_mf(char * filename){
      while ( fgets( fname,255,lst_f ) )
       {
        /* remove spaces from end of fname */
-       char *t=fname + strlen( fname ) - 1;
+       unsigned char *t=fname + strlen( fname ) - 1;
        while ( t > fname && isspace( *t ) ) *(t--)=0;
        if ( stat( fname,&fs ) )
         {
diff -NpuBr -Xexclude.txt main/libvo/vo_fbdev.c sherpya/libvo/vo_fbdev.c
--- main/libvo/vo_fbdev.c	2010-06-24 22:18:21.750000000 +0200
+++ sherpya/libvo/vo_fbdev.c	2010-07-29 15:17:08.171875000 +0200
@@ -102,8 +102,8 @@ static int validate_mode(fb_mode_t *m)
 
 static FILE *fp;
 static int line_num = 0;
-static char *line;
-static char *token[MAX_NR_TOKEN];
+static unsigned char *line;
+static unsigned char *token[MAX_NR_TOKEN];
 
 static int get_token(int num)
 {
diff -NpuBr -Xexclude.txt main/parser-cfg.c sherpya/parser-cfg.c
--- main/parser-cfg.c	2010-06-24 22:18:51.390625000 +0200
+++ sherpya/parser-cfg.c	2010-07-29 15:17:08.187500000 +0200
@@ -59,10 +59,10 @@ int m_config_parse_config_file(m_config_
 #define MAX_OPT_LEN	1000
 #define MAX_PARAM_LEN	1500
 	FILE *fp;
-	char *line;
-	char opt[MAX_OPT_LEN + 1];
-	char param[MAX_PARAM_LEN + 1];
-	char c;		/* for the "" and '' check */
+	unsigned char *line;
+	unsigned char opt[MAX_OPT_LEN + 1];
+	unsigned char param[MAX_PARAM_LEN + 1];
+	unsigned char c;		/* for the "" and '' check */
 	int tmp;
 	int line_num = 0;
 	int line_pos;	/* line pos */
diff -NpuBr -Xexclude.txt main/stream/stream_dvd.c sherpya/stream/stream_dvd.c
--- main/stream/stream_dvd.c	2010-02-17 02:32:49.546875000 +0100
+++ sherpya/stream/stream_dvd.c	2010-07-29 15:17:08.187500000 +0200
@@ -84,8 +84,8 @@ static const struct m_struct_st stream_o
   stream_opts_fields
 };
 
-int dvd_parse_chapter_range(const m_option_t *conf, const char *range) {
-  const char *s;
+int dvd_parse_chapter_range(const m_option_t *conf, const unsigned char *range) {
+  const unsigned char *s;
   char *t;
   if (!range)
     return M_OPT_MISSING_PARAM;
diff -NpuBr -Xexclude.txt main/stream/stream_dvd.h sherpya/stream/stream_dvd.h
--- main/stream/stream_dvd.h	2010-02-20 01:45:05.843750000 +0100
+++ sherpya/stream/stream_dvd.h	2010-07-29 15:17:08.203125000 +0200
@@ -62,6 +62,6 @@ int dvd_lang_from_sid(stream_t *stream,
 int dvd_aid_from_lang(stream_t *stream, unsigned char* lang);
 int dvd_sid_from_lang(stream_t *stream, unsigned char* lang);
 int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell);
-int dvd_parse_chapter_range(const m_option_t *conf, const char *range);
+int dvd_parse_chapter_range(const m_option_t *conf, const unsigned char *range);
 
 #endif /* MPLAYER_STREAM_DVD_H */
diff -NpuBr -Xexclude.txt main/stream/tv.c sherpya/stream/tv.c
--- main/stream/tv.c	2010-07-13 20:07:51.937500000 +0200
+++ sherpya/stream/tv.c	2010-07-29 15:17:08.203125000 +0200
@@ -528,7 +528,7 @@ static int open_tv(tvi_handle_t *tvh)
 	int channel = 0;
 	if (tvh->tv_param->channel)
 	 {
-	   if (isdigit(*tvh->tv_param->channel))
+	   if (isdigit((unsigned char) *tvh->tv_param->channel))
 		/* if tvh->tv_param->channel begins with a digit interpret it as a number */
 		channel = atoi(tvh->tv_param->channel);
 	   else
diff -NpuBr -Xexclude.txt main/subreader.c sherpya/subreader.c
--- main/subreader.c	2010-07-29 14:54:04.765625000 +0200
+++ sherpya/subreader.c	2010-07-29 15:17:08.218750000 +0200
@@ -87,12 +87,12 @@ int sub_format=SUB_INVALID;
 unsigned long previous_sub_end;
 #endif
 
-static int eol(char p) {
+static int eol(unsigned char p) {
 	return p=='\r' || p=='\n' || p=='\0';
 }
 
 /* Remove leading and trailing space */
-static void trail_space(char *s) {
+static void trail_space(unsigned char *s) {
 	int i = 0;
 	while (isspace(s[i])) ++i;
 	if (i) strcpy(s, s + i);
@@ -718,8 +718,8 @@ static void sub_pp_ssa(subtitle *sub) {
  * by set, based on code by szabi (dunnowhat sub format ;-)
  */
 static subtitle *sub_read_line_pjs(stream_t *st,subtitle *current, int utf16) {
-    char line[LINE_LEN+1];
-    char text[LINE_LEN+1], *s, *d;
+    unsigned char line[LINE_LEN+1];
+    unsigned char text[LINE_LEN+1], *s, *d;
 
     if (!stream_read_line (st, line, LINE_LEN, utf16))
 	return NULL;
@@ -759,7 +759,7 @@ static subtitle *sub_read_line_mpsub(str
 	char line[LINE_LEN+1];
 	float a,b;
 	int num=0;
-	char *p, *q;
+	unsigned char *p, *q;
 
 	do
 	{
@@ -911,7 +911,7 @@ static subtitle *sub_read_line_subrip09(
 
 static subtitle *sub_read_line_jacosub(stream_t* st, subtitle * current, int utf16)
 {
-    char line1[LINE_LEN], line2[LINE_LEN], directive[LINE_LEN], *p, *q;
+    unsigned char line1[LINE_LEN], line2[LINE_LEN], directive[LINE_LEN], *p, *q;
     unsigned a1, a2, a3, a4, b1, b2, b3, b4, comment = 0;
     static unsigned jacoTimeres = 30;
     static int jacoShift = 0;
@@ -1821,7 +1821,7 @@ char * strreplace( char * in,char * what
 #endif
 
 
-static void strcpy_trim(char *d, char *s)
+static void strcpy_trim(unsigned char *d, unsigned char *s)
 {
     // skip leading whitespace
     while (*s && isspace(*s)) {
@@ -1871,7 +1871,7 @@ static void strcpy_get_ext(char *d, char
    }
 }
 
-static int whiteonly(char *s)
+static int whiteonly(unsigned char *s)
 {
     while (*s) {
 	if (!isspace(*s)) return 0;
diff -NpuBr -Xexclude.txt main/vobsub.c sherpya/vobsub.c
--- main/vobsub.c	2010-07-29 14:54:04.687500000 +0200
+++ sherpya/vobsub.c	2010-07-29 15:17:08.234375000 +0200
@@ -235,7 +235,7 @@ typedef FILE rar_stream_t;
 
 /**********************************************************************/
 
-static ssize_t vobsub_getline(char **lineptr, size_t *n, rar_stream_t *stream)
+static ssize_t vobsub_getline(unsigned char **lineptr, size_t *n, rar_stream_t *stream)
 {
     size_t res = 0;
     int c;
@@ -244,7 +244,7 @@ static ssize_t vobsub_getline(char **lin
         if (*lineptr)
             *n = 4096;
     } else if (*n == 0) {
-        char *tmp = realloc(*lineptr, 4096);
+        unsigned char *tmp = realloc(*lineptr, 4096);
         if (tmp) {
             *lineptr = tmp;
             *n = 4096;
@@ -672,11 +672,11 @@ static int vobsub_add_timestamp(vobsub_t
     return -1;
 }
 
-static int vobsub_parse_id(vobsub_t *vob, const char *line)
+static int vobsub_parse_id(vobsub_t *vob, const unsigned char *line)
 {
     // id: xx, index: n
     size_t idlen;
-    const char *p, *q;
+    const unsigned char *p, *q;
     p  = line;
     while (isspace(*p))
         ++p;
@@ -699,10 +699,10 @@ static int vobsub_parse_id(vobsub_t *vob
     return vobsub_add_id(vob, p, idlen, atoi(q));
 }
 
-static int vobsub_parse_timestamp(vobsub_t *vob, const char *line)
+static int vobsub_parse_timestamp(vobsub_t *vob, const unsigned char *line)
 {
     // timestamp: HH:MM:SS.mmm, filepos: 0nnnnnnnnn
-    const char *p;
+    const unsigned char *p;
     int h, m, s, ms;
     off_t filepos;
     while (isspace(*line))
@@ -753,10 +753,10 @@ static int vobsub_parse_timestamp(vobsub
     return vobsub_add_timestamp(vob, filepos, vob->delay + ms + 1000 * (s + 60 * (m + 60 * h)));
 }
 
-static int vobsub_parse_origin(vobsub_t *vob, const char *line)
+static int vobsub_parse_origin(vobsub_t *vob, const unsigned char *line)
 {
     // org: X,Y
-    char *p;
+    unsigned char *p;
     while (isspace(*line))
         ++line;
     if (!isdigit(*line))
@@ -796,7 +796,7 @@ unsigned int vobsub_rgb_to_yuv(unsigned
     return y << 16 | u << 8 | v;
 }
 
-static int vobsub_parse_delay(vobsub_t *vob, const char *line)
+static int vobsub_parse_delay(vobsub_t *vob, const unsigned char *line)
 {
     int h, m, s, ms;
     int forward = 1;
@@ -820,7 +820,7 @@ static int vobsub_parse_delay(vobsub_t *
     return 0;
 }
 
-static int vobsub_set_lang(const char *line)
+static int vobsub_set_lang(const unsigned char *line)
 {
     if (vobsub_id == -1)
         vobsub_id = atoi(line + 8);
@@ -834,7 +834,7 @@ static int vobsub_parse_one_line(vobsub_
     ssize_t line_size;
     int res = -1;
         size_t line_reserve = 0;
-        char *line = NULL;
+        unsigned char *line = NULL;
     do {
         line_size = vobsub_getline(&line, &line_reserve, fd);
         if (line_size < 0 || line_size > 1000000 ||