[MPlayer-cvslog] r23786 - trunk/command.c

reimar subversion at mplayerhq.hu
Sun Jul 15 19:56:06 CEST 2007


Author: reimar
Date: Sun Jul 15 19:56:06 2007
New Revision: 23786

Log:
Make sure that sub->id is -2 and sub->sh is NULL if subtitle doesn't
exist. Probably sanest way to avoid crash in e.g. mov demuxer without
having to check both all the time.


Modified:
   trunk/command.c

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	(original)
+++ trunk/command.c	Sun Jul 15 19:56:06 2007
@@ -1342,6 +1342,9 @@ static int mp_property_sub(m_option_t * 
 		else if (ass_enabled && sh->type == 'a')
 		    ass_track = sh->ass_track;
 #endif
+            } else {
+              d_sub->id = -2;
+              d_sub->sh = NULL;
 	    }
 	}
     }



More information about the MPlayer-cvslog mailing list