[Mplayer-cvslog] CVS: main subreader.c,1.132,1.133

[Richard Felker CVS]

CVS change done by Richard Felker CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv20938

Modified Files:
	subreader.c 
Log Message:
more cola for jindrich

Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- subreader.c	9 May 2004 03:43:42 -0000	1.132
+++ subreader.c	9 May 2004 22:15:54 -0000	1.133
@@ -1348,6 +1348,7 @@
     
     rewind (fd);
 
+#ifdef USE_ICONV
 #ifdef HAVE_ENCA
     if (sscanf(sub_cp, "enca:%2s:%s", enca_lang, enca_fallback) == 2
 	|| sscanf(sub_cp, "ENCA:%2s:%s", enca_lang, enca_fallback) == 2) {
@@ -1359,7 +1360,6 @@
     current_sub_cp = sub_cp ? strdup(sub_cp) : NULL;
 #endif
 
-#ifdef USE_ICONV
     sub_utf8_prev=sub_utf8;
     {
 	    int l,k;