diff options
author | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-21 09:28:01 +0000 |
---|---|---|
committer | gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-21 09:28:01 +0000 |
commit | 2029141cf3ae1104b4dd33063abec2bc6b9cba19 (patch) | |
tree | 94e6581d9408d53e19d4c838098ad7b8b592b069 /mplayer.c | |
parent | 3fb54d2e99786de170df869a4b9ac63425f7bd11 (diff) | |
download | mpv-2029141cf3ae1104b4dd33063abec2bc6b9cba19.tar.bz2 mpv-2029141cf3ae1104b4dd33063abec2bc6b9cba19.tar.xz |
fix null pointer check in add_subtitles,
patch by Konstantin G. Khlebikov % koct9i A gmail P com %
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19474 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -814,7 +814,7 @@ void add_subtitles(char *filename, float fps, int silent) #ifdef USE_ASS if (ass_enabled) asst = ass_read_file(filename); - if (ass_enabled && !asst) + if (ass_enabled && subd && !asst) asst = ass_read_subdata(subd, fps); if (!asst && !subd && !silent) |