[Mplayer-cvslog] CVS: main subreader.c,1.114,1.115

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv25177

Modified Files:
	subreader.c 
Log Message:
1, micro-speedup 2, fixed 10l: only prefer utf8 if iconv is present

Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- subreader.c	27 Jul 2003 22:23:07 -0000	1.114
+++ subreader.c	28 Jul 2003 14:17:31 -0000	1.115
@@ -1694,11 +1694,11 @@
 		// 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 @@
 
 		    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"))) {