diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-29 17:29:55 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-29 17:29:55 +0000 |
| commit | 149b0891e558136b7f590f724f1d16b31a6f46a8 (patch) | |
| tree | 8641a46df8a2642706458ac7aa40309179b0db69 /libass/ass.c | |
| parent | 788cdf051bdcf0b00523c4ac18665b8b1bfc80a6 (diff) | |
| download | libass-149b0891e558136b7f590f724f1d16b31a6f46a8.tar.bz2 libass-149b0891e558136b7f590f724f1d16b31a6f46a8.tar.xz | |
Revert r20517.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20519 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass/ass.c')
| -rw-r--r-- | libass/ass.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libass/ass.c b/libass/ass.c index a4039e9f..f55675bb 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -30,6 +30,10 @@ #include <unistd.h> #include <inttypes.h> +#ifdef HAVE_ENCA +#include "subreader.h" // for guess_buffer_cp +#endif + #ifdef USE_ICONV #include <iconv.h> #endif @@ -38,6 +42,7 @@ #include "ass.h" #include "ass_utils.h" #include "ass_library.h" +#include "libvo/sub.h" // for utf8_get_char typedef enum {PST_UNKNOWN = 0, PST_INFO, PST_STYLES, PST_EVENTS, PST_FONTS} parser_state_t; @@ -805,7 +810,7 @@ static char* sub_recode(char* data, size_t size, char* codepage) char enca_lang[3], enca_fallback[100]; if (sscanf(codepage, "enca:%2s:%99s", enca_lang, enca_fallback) == 2 || sscanf(codepage, "ENCA:%2s:%99s", enca_lang, enca_fallback) == 2) { - cp_tmp = ass_guess_buffer_cp((unsigned char*)data, size, enca_lang, enca_fallback); + cp_tmp = guess_buffer_cp((unsigned char*)data, size, enca_lang, enca_fallback); } #endif if ((icdsc = iconv_open (tocp, cp_tmp)) != (iconv_t)(-1)){ @@ -991,7 +996,7 @@ static char* validate_fname(char* name) q = fname = malloc(sz + 1); p = name; while (*p) { - code = ass_utf8_get_char(&p); + code = utf8_get_char(&p); if (code == 0) break; if ( (code > 0x7F) || |