11110001.txt find_sub sig11 fixed

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2881 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2001-11-13 21:18:25 +00:00
parent cab56fc5f5
commit 01934100b7
2 changed files with 5 additions and 1 deletions

View File

@ -565,7 +565,6 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
||(0==strcmp(&sub_name[l-4],".UTF")))) ||(0==strcmp(&sub_name[l-4],".UTF"))))
sub_utf8=1; sub_utf8=1;
subtitles=sub_read_file(sub_name); subtitles=sub_read_file(sub_name);
if (sub_num == 0) printf ("SUB: No subtitles found in %s\n",sub_name);
if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name); if(!subtitles || sub_num == 0) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,sub_name);
} }
#endif #endif

View File

@ -633,6 +633,11 @@ subtitle* sub_read_file (char *filename) {
if (sub_errs) printf (", %i bad line(s).\n", sub_errs); if (sub_errs) printf (", %i bad line(s).\n", sub_errs);
else printf (".\n"); else printf (".\n");
if(sub_num<=0){
free(first);
return NULL;
}
return first; return first;
} }