-diff -urN vlc-original/configure.ac vlc/configure.ac
+diff -x '*.o' -x '*.lo' -x '*.la' -x '*.loT' -x '*.Po' -x .deps -x .libs -x autom4te.cache -x Makefile -x Makefile.in -x configure -x config.log -x config.status -x config.guess -x config.sub -x aclocal.m4 -x config.rpath -x .svn -x .depend -x libtool -x ltmain.sh -x depcomp -x missing -x compile -x install-sh -x POTFILES -x stamp-h1 -x activex -x m4 -x vlc-config -x vlc-config.in -x vlc.win32.nsi -x config.h -x ffmpeg -x modules_builtin.h -x builtin.h -x version.c -x revision.c -x config.h.in -x Makefile.am -x '*.po' -x po -x '*.pc' -x '*~' -x '*.rej' -x ABOUT-NLS -x cvlc -x svlc -x rvlc -x vlc_about.h -x vlc_threads_funcs.h -urN vlc-original/configure.ac vlc/configure.ac
 --- vlc-original/configure.ac	2008-03-21 13:55:57.000000000 +0000
 +++ vlc/configure.ac	2008-03-22 20:47:34.000000000 +0000
 @@ -3881,6 +3881,32 @@

+    decoder_sys_t *p_sys = p_dec->p_sys;
+    const kate_event *ev=NULL;
+    subpicture_t *p_spu = NULL;
+    int ret;
+    video_format_t fmt;
+    kate_tracker kin;
+    vlc_bool_t tracker_valid = VLC_FALSE;

+    free( p_sys );
+}
+
diff -x '*.o' -x '*.lo' -x '*.la' -x '*.loT' -x '*.Po' -x .deps -x .libs -x autom4te.cache -x Makefile -x Makefile.in -x configure -x config.log -x config.status -x config.guess -x config.sub -x aclocal.m4 -x config.rpath -x .svn -x .depend -x libtool -x ltmain.sh -x depcomp -x missing -x compile -x install-sh -x POTFILES -x stamp-h1 -x activex -x m4 -x vlc-config -x vlc-config.in -x vlc.win32.nsi -x config.h -x ffmpeg -x modules_builtin.h -x builtin.h -x version.c -x revision.c -x config.h.in -x Makefile.am -x '*.po' -x po -x '*.pc' -x '*~' -x '*.rej' -x ABOUT-NLS -x cvlc -x svlc -x rvlc -x vlc_about.h -x vlc_threads_funcs.h -urN vlc-original/modules/demux/mkv.cpp vlc/modules/demux/mkv.cpp
--- vlc-original/modules/demux/mkv.cpp	2008-03-17 13:44:23.000000000 +0000
+++ vlc/modules/demux/mkv.cpp	2008-03-21 23:13:51.000000000 +0000
@@ -2546,6 +2546,55 @@
