[MPlayer-cvslog] CVS: main mplayer.c, 1.937, 1.938 mencoder.c, 1.348, 1.349

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

Modified Files:
	mplayer.c mencoder.c 
Log Message:
Remove support for default.sub.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.937
retrieving revision 1.938
diff -u -r1.937 -r1.938
--- mplayer.c	23 Apr 2006 23:14:58 -0000	1.937
+++ mplayer.c	23 Apr 2006 23:26:12 -0000	1.938
@@ -3229,14 +3229,6 @@
         free(tmp[i++]);
     }
     free(tmp);
-    if (set_of_sub_size == 0)
-    {
-        struct stat st;
-        mem_ptr = get_path("default.sub");
-        if (stat(mem_ptr, &st) == 0)
-            add_subtitles (mem_ptr, sh_video->fps, 0);
-    free(mem_ptr); // release the buffer created by get_path()
-    }
   }
   if (set_of_sub_size > 0)  {
       // setup global sub numbering

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- mencoder.c	30 Mar 2006 23:44:35 -0000	1.348
+++ mencoder.c	23 Apr 2006 23:26:12 -0000	1.349
@@ -649,16 +649,14 @@
     subdata=sub_read_file(sub_name[0], sh_video->fps);
     if(!subdata) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name[0]);
   } else
-  if(sub_auto) { // auto load sub file ...
+  if(sub_auto && filename) { // auto load sub file ...
     char **tmp = NULL;
     int i = 0;
-    if (filename) {
-      char *psub = get_path( "sub/" );
-      tmp = sub_filenames((psub ? psub : ""), filename);
-      free(psub);
-    }
-    subdata=sub_read_file(tmp ? tmp[0] : "default.sub", sh_video->fps);
-    while (tmp && tmp[i])
+    char *psub = get_path( "sub/" );
+    tmp = sub_filenames((psub ? psub : ""), filename);
+    free(psub);
+    subdata=sub_read_file(tmp[0], sh_video->fps);
+    while (tmp[i])
       free(tmp[i++]);
     free(tmp);
   }