# HG changeset patch # User gpoirier # Date 1156152481 0 # Node ID ecd8f562e19bc01beaa66e4b930d2b4c5d70d856 # Parent c4283270c67e068d417ee17ab28dd192623a7d1c fix null pointer check in add_subtitles, patch by Konstantin G. Khlebikov % koct9i A gmail P com % diff -r c4283270c67e -r ecd8f562e19b mplayer.c --- 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)