Remove support for default.sub.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18233 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 6 insertions, 18 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index a44dc8cf7e..1a23fe782b 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -9682,8 +9682,6 @@ in this order:
 /path/\:to/\:movie.sub
 .br
 ~/.mplayer/\:sub/\:movie.sub
-.br
-~/.mplayer/\:default.sub
 .RE
 .PD 1
 .
diff --git a/mencoder.c b/mencoder.c
index 0b0da44c0d..58e9005cc8 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -649,16 +649,14 @@ if(sh_audio && (out_audio_codec || seek_to_sec || !sh_audio->wf || playback_spee
     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 --git a/mplayer.c b/mplayer.c
index 0e0eb135e5..09cc469d68 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3229,14 +3229,6 @@ if(sh_video) {
         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