[MPlayer-cvslog] r19474 - trunk/mplayer.c

[gpoirier]

Author: gpoirier
Date: Mon Aug 21 11:28:01 2006
New Revision: 19474

Modified:
   trunk/mplayer.c

Log:
fix null pointer check in add_subtitles,
patch by Konstantin G. Khlebikov % koct9i A gmail P com %


Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Mon Aug 21 11:28:01 2006
@@ -814,7 +814,7 @@
 #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)