RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-02 21:12:23 +00:00
Code Issues Releases Wiki Activity

Remove support for default.sub.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18233 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-04-23 23:26:12 +00:00
parent 55ca108b4c
commit 98aee4cb65
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCS/man/en/mplayer.1
View File

@ -9682,8 +9682,6 @@ in this order:
/path/\:to/\:movie.sub
.br
~/.mplayer/\:sub/\:movie.sub
.br
~/.mplayer/\:default.sub
.RE
.PD 1
.

14
mencoder.c
View File

@ -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);
}

8
mplayer.c
View File

@ -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