From 2029141cf3ae1104b4dd33063abec2bc6b9cba19 Mon Sep 17 00:00:00 2001
From: gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 21 Aug 2006 09:28:01 +0000
Subject: 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
---
 mplayer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mplayer.c')

diff --git a/mplayer.c b/mplayer.c
index 98ca062461..a6e00e3736 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -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)
-- 
cgit v1.2.3