[MPlayer-dev-eng] [PATCH] remove default.sub fallback

[Diego Biurrun]

As discussed on -cvslog..  Here is a patch, have I overlooked something?

Diego
-------------- next part --------------
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.930
diff -u -r1.930 mplayer.c
--- mplayer.c	17 Apr 2006 16:31:42 -0000	1.930
+++ mplayer.c	18 Apr 2006 12:10:59 -0000
@@ -3109,14 +3109,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
diff -u -r1.348 mencoder.c
--- mencoder.c	30 Mar 2006 23:44:35 -0000	1.348
+++ mencoder.c	18 Apr 2006 12:10:59 -0000
@@ -657,7 +657,7 @@
       tmp = sub_filenames((psub ? psub : ""), filename);
       free(psub);
     }
-    subdata=sub_read_file(tmp ? tmp[0] : "default.sub", sh_video->fps);
+    subdata=sub_read_file(tmp ? tmp[0] : tmp, sh_video->fps);
     while (tmp && tmp[i])
       free(tmp[i++]);
     free(tmp);