summaryrefslogtreecommitdiffstats
path: root/subreader.c
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-09 03:43:42 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-09 03:43:42 +0000
commit9408d2473669258b1653afa60cb9d5521bb9e771 (patch)
tree08b74f0a5b9a068bc7c0205ef203fe22fa6f3b5b /subreader.c
parentf0978d51d9a3946848ee10e654a90ccd37877383 (diff)
downloadmpv-9408d2473669258b1653afa60cb9d5521bb9e771.tar.bz2
mpv-9408d2473669258b1653afa60cb9d5521bb9e771.tar.xz
1000000l for sig11 without -subcp!!! (and 1l for my first commit :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12450 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'subreader.c')
-rw-r--r--subreader.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/subreader.c b/subreader.c
index b492705f46..3298c29108 100644
--- a/subreader.c
+++ b/subreader.c
@@ -1353,10 +1353,10 @@ sub_data* sub_read_file (char *filename, float fps) {
|| sscanf(sub_cp, "ENCA:%2s:%s", enca_lang, enca_fallback) == 2) {
current_sub_cp = guess_cp(fd, enca_lang, enca_fallback);
} else {
- current_sub_cp = strdup(sub_cp);
+ current_sub_cp = sub_cp ? strdup(sub_cp) : NULL;
}
#else
- current_sub_cp = strdup(sub_cp);
+ current_sub_cp = sub_cp ? strdup(sub_cp) : NULL;
#endif
#ifdef USE_ICONV