# HG changeset patch
# User diego
# Date 1145834772 0
# Node ID 6ce77dda13a55ff21b2d365c985e8d6a3dc3bda2
# Parent  697fe7e93beda2ad2c795901cb56b72a68301938
Remove support for default.sub.

diff -r 697fe7e93bed -r 6ce77dda13a5 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Sun Apr 23 23:14:58 2006 +0000
+++ b/DOCS/man/en/mplayer.1	Sun Apr 23 23:26:12 2006 +0000
@@ -9682,8 +9682,6 @@
 /path/\:to/\:movie.sub
 .br
 ~/.mplayer/\:sub/\:movie.sub
-.br
-~/.mplayer/\:default.sub
 .RE
 .PD 1
 .
diff -r 697fe7e93bed -r 6ce77dda13a5 mencoder.c
--- a/mencoder.c	Sun Apr 23 23:14:58 2006 +0000
+++ b/mencoder.c	Sun Apr 23 23:26:12 2006 +0000
@@ -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);
   }
diff -r 697fe7e93bed -r 6ce77dda13a5 mplayer.c
--- a/mplayer.c	Sun Apr 23 23:14:58 2006 +0000
+++ b/mplayer.c	Sun Apr 23 23:26:12 2006 +0000
@@ -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