From 05e09adb9f5d060381c411a25e55a237b2d878ee Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 28 Jul 2003 14:17:31 +0000 Subject: 1, micro-speedup 2, fixed 10l: only prefer utf8 if iconv is present git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10495 b3059339-0415-0410-9bf9-f77b7e298cf2 --- subreader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'subreader.c') diff --git a/subreader.c b/subreader.c index f23b57baff..14cf51034c 100644 --- a/subreader.c +++ b/subreader.c @@ -1694,11 +1694,11 @@ char** sub_filenames(char* path, char *fname) // we have a (likely) subtitle file if (found) { int prio = 0; - if (tmp_sub_id) + if (tmp_sub_id && (sub_match_fuzziness >= 1)) { sprintf(tmpresult, "%s %s", f_fname_trim, tmp_sub_id); printf("dvdsublang...%s\n", tmpresult); - if (strcmp(tmp_fname_trim, tmpresult) == 0 && sub_match_fuzziness >= 1) { + if (strcmp(tmp_fname_trim, tmpresult) == 0) { // matches the movie name + lang extension prio = 5; break; @@ -1729,8 +1729,10 @@ char** sub_filenames(char* path, char *fname) if (prio) { prio += prio; +#ifdef USE_ICONV if (i<3) // prefer UTF-8 coded prio++; +#endif sprintf(tmpresult, "%s%s", j == 0 ? f_dir : path, de->d_name); // fprintf(stderr, "%s priority %d\n", tmpresult, prio); if ((f = fopen(tmpresult, "rt"))) { -- cgit v1.2.3