[MPlayer-cvslog] r34366 - trunk/mencoder.c

ranma subversion at mplayerhq.hu
Tue Nov 29 14:02:46 CET 2011


Author: ranma
Date: Tue Nov 29 14:02:45 2011
New Revision: 34366

Log:
edl_seek_type is used as CONF_TYPE_FLAG, which is a 32bit-Type (fixes possible memory corruption).

Modified:
   trunk/mencoder.c

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Tue Nov 29 06:05:16 2011	(r34365)
+++ trunk/mencoder.c	Tue Nov 29 14:02:45 2011	(r34366)
@@ -238,7 +238,7 @@ static edl_record_ptr edl_records = NULL
 static edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records
 static short edl_muted; ///< Stores whether EDL is currently in muted mode.
 static short edl_seeking; ///< When non-zero, stream is seekable.
-static short edl_seek_type; ///< When non-zero, frames are discarded instead of seeking.
+static int edl_seek_type; ///< When non-zero, frames are discarded instead of seeking.
 
 /* This header requires all the global variable declarations. */
 #include "cfg-mencoder.h"


More information about the MPlayer-cvslog mailing list