summaryrefslogtreecommitdiffstats
path: root/subreader.c
diff options
context:
space:
mode:
authorhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-21 16:02:09 +0000
committerhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-21 16:02:09 +0000
commitc7fa4d768d6ea7278658cb0b329b659afaaf179e (patch)
tree4427dfd33527c38a25c40dfe12cb9b3c665fa38b /subreader.c
parent47eb1875d0942ae756c6204126a23e4797ff1a16 (diff)
downloadmpv-c7fa4d768d6ea7278658cb0b329b659afaaf179e.tar.bz2
mpv-c7fa4d768d6ea7278658cb0b329b659afaaf179e.tar.xz
1e6l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12494 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'subreader.c')
-rw-r--r--subreader.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/subreader.c b/subreader.c
index 4522c8c428..3bc8f583aa 100644
--- a/subreader.c
+++ b/subreader.c
@@ -1045,11 +1045,13 @@ static iconv_t icdsc = (iconv_t)(-1);
void subcp_open_noenca ()
{
char enca_lang[100], enca_fallback[100];
- if (sscanf(sub_cp, "enca:%2s:%s", enca_lang, enca_fallback) == 2
- || sscanf(sub_cp, "ENCA:%2s:%s", enca_lang, enca_fallback) == 2) {
- subcp_open(enca_fallback);
- } else {
- subcp_open(sub_cp);
+ if (sub_cp) {
+ if (sscanf(sub_cp, "enca:%2s:%s", enca_lang, enca_fallback) == 2
+ || sscanf(sub_cp, "ENCA:%2s:%s", enca_lang, enca_fallback) == 2) {
+ subcp_open(enca_fallback);
+ } else {
+ subcp_open(sub_cp);
+ }
}
}
#else