[Mplayer-cvslog] CVS: main mplayer.c,1.315,1.316 subreader.c,1.35,1.36

[Arpi of Ize]

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

Modified Files:
	mplayer.c subreader.c 
Log Message:
11110001.txt find_sub sig11 fixed

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- mplayer.c	12 Nov 2001 15:16:12 -0000	1.315
+++ mplayer.c	13 Nov 2001 21:18:25 -0000	1.316
@@ -565,7 +565,6 @@
 		   ||(0==strcmp(&sub_name[l-4],".UTF"))))
 	  sub_utf8=1;
        subtitles=sub_read_file(sub_name);
-       if (sub_num == 0) printf ("SUB: No subtitles found in %s\n",sub_name);
        if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
   }
 #endif

Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- subreader.c	11 Nov 2001 15:41:17 -0000	1.35
+++ subreader.c	13 Nov 2001 21:18:25 -0000	1.36
@@ -633,6 +633,11 @@
     if (sub_errs) printf (", %i bad line(s).\n", sub_errs);
     else 	  printf (".\n");
 
+    if(sub_num<=0){
+	free(first);
+	return NULL;
+    }
+
     return first;
 }