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

[Richard Felker CVS]

CVS change done by Richard Felker CVS

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

Modified Files:
	subreader.c 
Log Message:
1000000l for sig11 without -subcp!!!

Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- subreader.c	8 May 2004 17:52:25 -0000	1.131
+++ subreader.c	9 May 2004 03:41:18 -0000	1.132
@@ -1348,16 +1348,18 @@
     
     rewind (fd);
 
+    puts("a");
 #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) {
 	current_sub_cp = guess_cp(fd, enca_lang, enca_fallback);
     } else {
-	current_sub_cp = strdup(sub_cp);
+	current_sub_cp = sub_cp ? strdup(sub_cp) : NULL;
     }
 #else
-    current_sub_cp = strdup(sub_cp);
+    current_sub_cp = sub_cp ? strdup(sub_cp) : NULL;
 #endif
+    puts("b");
 
 #ifdef USE_ICONV
     sub_utf8_prev=sub_utf8;