Index: libvo/font_load_ft.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/font_load_ft.c,v retrieving revision 1.9 diff -u -r1.9 font_load_ft.c --- libvo/font_load_ft.c 30 Jan 2003 19:58:43 -0000 1.9 +++ libvo/font_load_ft.c 23 May 2003 13:53:20 -0000 @@ -18,7 +18,9 @@ #include #include +#ifdef USE_ICONV #include +#endif #include #include @@ -726,6 +728,7 @@ } +#ifdef USE_ICONV /* decode from 'encoding' to unicode */ static FT_ULong decode_char(iconv_t *cd, char c) { FT_ULong o; @@ -785,6 +788,7 @@ return charset_size; } +#endif static int prepare_charset_unicode(FT_Face face, FT_ULong *charset, FT_ULong *charcodes) { #ifdef HAVE_FREETYPE21 @@ -1008,11 +1012,16 @@ if (unicode) { charset_size = prepare_charset_unicode(face, my_charset, my_charcodes); } else { +#ifdef USE_ICONV if (subtitle_font_encoding) { charset_size = prepare_charset(charmap, subtitle_font_encoding, my_charset, my_charcodes); } else { charset_size = prepare_charset(charmap, "iso-8859-1", my_charset, my_charcodes); } +#else + charset_size = 0; + mp_msg(MSGT_OSD, MSGL_ERR, "subtitle font: font isn't unicode.\n"); +#endif } if (charset_size < 0) {