Mercurial > mplayer.hg

changeset 19468:ecd8f562e19b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix null pointer check in add_subtitles, patch by Konstantin G. Khlebikov % koct9i A gmail P com %
author gpoirier
date Mon, 21 Aug 2006 09:28:01 +0000
parents c4283270c67e
children b9d2ceb63777
files mplayer.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Mon Aug 21 00:42:34 2006 +0000
+++ b/mplayer.c	Mon Aug 21 09:28:01 2006 +0000
@@ -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)