summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-13 21:18:25 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-13 21:18:25 +0000
commit01934100b7e643f0fa5b497f2b290f145648bef9 (patch)
tree17d31ff920f37ab30264bc321104cb01f7496a2d
parentcab56fc5f5e764d867bb480c7477584f4950e7cc (diff)
downloadmpv-01934100b7e643f0fa5b497f2b290f145648bef9.tar.bz2
mpv-01934100b7e643f0fa5b497f2b290f145648bef9.tar.xz
11110001.txt find_sub sig11 fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2881 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--mplayer.c1
-rw-r--r--subreader.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index da905e6b33..2f1cea7ef4 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -565,7 +565,6 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
||(0==strcmp(&sub_name[l-4],".UTF"))))
sub_utf8=1;
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);
}
#endif
diff --git a/subreader.c b/subreader.c
index 85fc36e800..94e916890b 100644
--- a/subreader.c
+++ b/subreader.c
@@ -633,6 +633,11 @@ subtitle* sub_read_file (char *filename) {
if (sub_errs) printf (", %i bad line(s).\n", sub_errs);
else printf (".\n");
+ if(sub_num<=0){
+ free(first);
+ return NULL;
+ }
+
return first;
}