diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-23 23:26:12 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-23 23:26:12 +0000 |
| commit | 98aee4cb6518ae77402ae322ec393de27d61a518 (patch) | |
| tree | aca7ac4d1cd16c4633157b1c37379ad022beb3c5 /mencoder.c | |
| parent | 55ca108b4c33aa0dfebf80995ff368279cafd35e (diff) | |
| download | mpv-98aee4cb6518ae77402ae322ec393de27d61a518.tar.bz2 mpv-98aee4cb6518ae77402ae322ec393de27d61a518.tar.xz | |
Remove support for default.sub.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18233 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 14 |
1 files changed, 6 insertions, 8 deletions
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); } |