Release v1.3.0

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/tags/libmatroska/libmatroska-1.3.0@818 a6f86f6d-0131-4f8e-9e7b-e335508773d5
Release v1.3.0
2011-09-23 13:46:13 +00:00 · 2011-09-23 13:44:42 +00:00 · 2011-09-23 11:56:44 +00:00
109 changed files with 13551 additions and 5509 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,18 +0,0 @@
-.deps/
-.libs/
-*.a
-*.la
-*.lo
-*.o
-*.pc
-Makefile
-Makefile.in
-.dirstamp
-
-/aclocal.m4
-/autom4te.cache/
-/build-aux/
-/config.*
-/configure
-/libtool
-/stamp-h1
--- a/75
+++ b/75
@ -1,77 +1,3 @@
-2015-11-21  Moritz Bunkus  <moritz@bunkus.org>
-
-        * KaxVersion.cpp: in order to enable deterministic builds the
-        KaxCodeDate variable has been set to "Unknown" instead of the date
-        and time of compilation. Patch by Ed Schouten <ed@nuxi.nl>.
-
-2015-10-20  Moritz Bunkus  <moritz@bunkus.org>
-
-        * Released v1.4.4.
-
-        * KaxInternalBlock::ReadData(): Fixed an invalid memory
-        access. When reading a block group or a simple block that uses
-        EBML lacing the frame sizes indicated in the lacing weren't
-        checked against the available number of bytes. If the indicated
-        frame size was bigger than the whole block's size the parser would
-        read beyond the end of the buffer resulting in a heap information
-        leak.
-
-2015-10-17  Moritz Bunkus  <moritz@bunkus.org>
-
-        * Released v1.4.3.
-
-2015-05-02  Daniel Winzen  <d@winzen4.de>
-
-        * all: a couple of optimizations in the main library and a memory
-        leak fix in the tests
-
-2015-02-01  Jan Engelhardt  <jengelh@inai.de>
-
-        * build system: fix linking against libEBML
-
-2015-01-04  Moritz Bunkus  <moritz@bunkus.org>
-
-        * Released v1.4.2.
-
-2014-12-21  Moritz Bunkus  <moritz@bunkus.org>
-
-        * build system: switched the build system from hand-crafted
-        Makefiles to an autoconf/automake-based system. A pkg-config file
-        will be installed as well; its name is »libmatroska«. Based on a
-        similar patch for libEBML by Jan Engelhardt <jengelh@inai.de>.
-
-2014-12-20  Moritz Bunkus  <moritz@bunkus.org>
-
-        * KaxBlock::ReadData(): fixed several instances of unchecked
-        memory access leading to invalid memory access/segmentation faults
-        with invalid or broken data inside block groups/simple blocks.
-
-2014-12-19  Moritz Bunkus  <moritz@bunkus.org>
-
-        * KaxBlock::ReadInternalHead(): fixed a off-by-one buffer overflow
-        if with EBML lacing and exactly one frame in the lace.
-
-2013-09-17 mosu
-New 1.4.1 version:
-    - Added new elements/classes DiscardPadding, CodecDelay and
-      SeekPreRoll
-    - The licensing information has been cleared up/unified.
-    - The Makefile now contain options for specifying the destination
-      base directory during installation ("DESTDIR") and for
-      specifying which library types to build ("link").
-    - The libraries are built without the "-ansi" and
-      "-fno-gnu-keywords" flags on Linux
-    - Code cleanup
-
-2013-03-19 mosu/robux4
-New 1.4.0 version:
-    * Note that this release is not binary compatible to 1.3.0 due to
-      the dependancy on libEBML 1.3.0 which is not binary compatible
-      to its predecessor.
-    - Added new elements CueDuration, CueRelativePosition,
-      ChapterStringUID, VideoAlphaMode and DefaultDecodedFieldDuration
-    - Removed the Debian build files from our package.
-
 2011-09-23 robux4/mosu
 New 1.3.0 version:
    - initialize all data members
@ -2055,3 +1981,4 @@ New 0.9.0 version:
 	  trunk/libmatroska/test/utf8,
 	  trunk/libmatroska/test/utf8/test5.cpp: Initial CVS version after
 	  the crash
+
--- a/LICENSE.LGPL
+++ b/LICENSE.LGPL
@ -2,7 +2,7 @@
 		       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the

    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 Also add information on how to contact you by electronic and paper mail.

@ -500,3 +500,5 @@ necessary.  Here is a sample; alter the names:
  Ty Coon, President of Vice

 That's all there is to it!
+
+
--- a/Makefile.am
+++ b/Makefile.am
@ -1,66 +0,0 @@
-# -*- Makefile -*-
-
-ACLOCAL_AMFLAGS = -I m4
-
-AM_CPPFLAGS = -I${top_srcdir}
-AM_CXXFLAGS = -Wall -Wextra -Wno-unknown-pragmas -Wshadow $(EBML_CFLAGS)
-if ENABLE_DEBUG
-AM_CPPFLAGS += -DDEBUG
-AM_CXXFLAGS += -g
-endif
-
-lib_LTLIBRARIES = libmatroska.la
-libmatroska_la_SOURCES = \
-	src/FileKax.cpp \
-	src/KaxAttached.cpp \
-	src/KaxAttachments.cpp \
-	src/KaxBlock.cpp \
-	src/KaxBlockData.cpp \
-	src/KaxCluster.cpp \
-	src/KaxContexts.cpp \
-	src/KaxCues.cpp \
-	src/KaxCuesData.cpp \
-	src/KaxInfoData.cpp \
-	src/KaxSeekHead.cpp \
-	src/KaxSegment.cpp \
-	src/KaxSemantic.cpp \
-	src/KaxTracks.cpp \
-	src/KaxVersion.cpp
-libmatroska_la_LDFLAGS = -version-info 6:0:0 -no-undefined
-libmatroska_la_LIBADD = $(EBML_LIBS)
-
-nobase_include_HEADERS = \
-	matroska/c/libmatroska.h \
-	matroska/c/libmatroska_t.h \
-	matroska/FileKax.h \
-	matroska/KaxAttached.h \
-	matroska/KaxAttachments.h \
-	matroska/KaxBlockData.h \
-	matroska/KaxBlock.h \
-	matroska/KaxChapters.h \
-	matroska/KaxClusterData.h \
-	matroska/KaxCluster.h \
-	matroska/KaxConfig.h \
-	matroska/KaxContentEncoding.h \
-	matroska/KaxContexts.h \
-	matroska/KaxCuesData.h \
-	matroska/KaxCues.h \
-	matroska/KaxDefines.h \
-	matroska/KaxInfoData.h \
-	matroska/KaxInfo.h \
-	matroska/KaxSeekHead.h \
-	matroska/KaxSegment.h \
-	matroska/KaxSemantic.h \
-	matroska/KaxTag.h \
-	matroska/KaxTags.h \
-	matroska/KaxTrackAudio.h \
-	matroska/KaxTrackEntryData.h \
-	matroska/KaxTracks.h \
-	matroska/KaxTrackVideo.h \
-	matroska/KaxTypes.h \
-	matroska/KaxVersion.h
-
-pkgconfigdir = ${libdir}/pkgconfig
-pkgconfig_DATA = libmatroska.pc
-
-${pkgconfig_DATA}: config.status
--- a/configure.ac
+++ b/configure.ac
@ -1,14 +0,0 @@
-AC_INIT([libmatroska], [1.4.4])
-AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax])
-AC_PROG_CXX
-LT_INIT
-AC_ARG_ENABLE([debug],
-	AS_HELP_STRING([--enable-debug], [Add -g -DDEBUG to compile flags]),
-	[enable_debug="$withval"], [enable_debug=no])
-AM_CONDITIONAL([ENABLE_DEBUG], [test "$enable_debug" = yes])
-PKG_CHECK_MODULES([EBML],[libebml >= 1.3.3])
-AC_CONFIG_FILES([Makefile libmatroska.pc])
-AC_OUTPUT
--- a/debian/changelog
+++ b/debian/changelog
@ -0,0 +1,204 @@
+libmatroska (1.3.0-1) natty; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Fri, 23 Sep 2011 13:54:26 +0200
+
+libmatroska (1.2.0-1) natty; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Wed, 15 Jun 2011 13:58:59 +0200
+
+libmatroska (1.1.0-1) lucid; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sun, 30 Jan 2011 15:30:00 +0200
+
+libmatroska (1.0.0-1) lucid; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sat, 05 Jun 2010 10:39:00 +0200
+
+libmatroska (0.9.0-1) karmic; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sun, 09 May 2010 16:59:20 +0200
+
+libmatroska (0.8.1-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Mon, 16 Jan 2007 17:00:30 +0100
+
+libmatroska (0.8.0-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Tue, 18 Oct 2005 20:00:18 +0200
+
+libmatroska (0.7.7-2) unstable; urgency=low
+
+  * Rebuilt with g++ 4.0.2.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sat, 15 Oct 2005 14:25:46 +0200
+
+libmatroska (0.7.7-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Fri, 20 May 2005 16:28:21 +0200
+
+libmatroska (0.7.6-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sat, 16 Apr 2005 13:24:30 +0200
+
+libmatroska (0.7.5-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sun,  6 Feb 2005 21:02:42 +0100
+
+libmatroska (0.7.4-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sun, 26 Sep 2004 12:35:05 +0200
+
+libmatroska (0.7.3-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Mon, 16 Aug 2004 22:52:57 +0200
+
+libmatroska (0.7.2-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Wed,  4 Aug 2004 19:49:25 +0200
+
+libmatroska (0.7.1-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sun, 25 Jul 2004 12:41:11 +0200
+
+libmatroska (0.7.0-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Fri, 23 Apr 2004 18:45:32 +0200
+
+libmatroska (0.6.3-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Mon,  5 Jan 2004 19:55:59 +0100
+
+libmatroska (0.6.2-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Tue, 30 Dec 2003 10:59:47 +0100
+
+libmatroska (0.6.1-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Thu, 30 Oct 2003 13:49:33 +0100
+
+libmatroska (0.6.0-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Tue, 28 Oct 2003 23:09:34 +0100
+
+libmatroska (0.5.3-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Wed, 22 Oct 2003 19:22:10 +0200
+
+libmatroska (0.5.2-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Wed, 17 Sep 2003 22:22:10 +0200
+
+libmatroska (0.5.1-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Mon,  1 Sep 2003 13:42:56 +0200
+
+libmatroska (0.5.0-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Mon, 28 Jul 2003 10:49:27 +0200
+
+libmatroska (0.4.4-2) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sat, 14 Jun 2003 17:40:11 +0200
+
+libmatroska (0.4.4-1) unstable; urgency=low
+
+  * New version.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Wed, 11 Jun 2003 20:32:09 +0200
+
+libmatroska (0.4.3-1) unstable; urgency=low
+
+  * New version with API changes.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Wed, 21 May 2003 22:35:52 +0200
+
+libmatroska (0.4.2-1) unstable; urgency=low
+
+  * New version with API changes.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Tue,  6 May 2003 22:33:44 +0200
+
+libmatroska (0.4.1-2) unstable; urgency=low
+
+  * Compiled with gcc 3.2.3
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sun, 04 May 2003 22:11:33 +0200
+
+libmatroska (0.4.1-1) unstable; urgency=low
+
+  * Some bugfixes, memleak fixed.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Sat, 03 May 2003 23:07:33 +0200
+
+libmatroska (0.4.0-1) unstable; urgency=low
+
+  * First alpha release :)
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Wed, 30 Apr 2003 10:44:33 +0200
+
+libmatroska (0.2.0.20030425) unstable; urgency=low
+
+  * New version with bugfixes by Steve.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Fri, 25 Apr 2003 20:01:49 +0200
+
+libmatroska (0.2.0.20030421) unstable; urgency=low
+
+  * Separated libebml from libmatroska like in the upstream sources.)
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Mon, 21 Apr 2003 16:33:36 +0200
+
+libmatroska (0.0.20030225) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Moritz Bunkus <moritz@bunkus.org>  Tue, 25 Feb 2003 18:28:52 +0100
+
--- a/debian/control
+++ b/debian/control
@ -0,0 +1,17 @@
+Source: libmatroska
+Priority: optional
+Maintainer: Moritz Bunkus <moritz@bunkus.org>
+Build-Depends: debhelper (>> 3.0.0), libebml-dev (>= 1.0.0-1)
+Standards-Version: 3.5.8
+Section: libs
+
+Package: libmatroska-dev
+Section: libdevel
+Architecture: any
+Depends: libebml-dev (>= 1.0.0-1)
+Description: an extensible open standard Audio/Video container format
+ Matroska is aiming to become the standard of Multimedia
+ Container Formats one day. It is based on EBML (Extensible Binary
+ Meta Language), a kind of binary version of XML. This way the
+ significant advantages in terms of future format extensability
+ are gained without breaking file support in old parsers.
--- a/debian/copyright
+++ b/debian/copyright
@ -0,0 +1,26 @@
+This package was debianized by Moritz Bunkus <moritz@bunkus.org> on
+Mon, 21 Apr 2003 12:49:33 +0200.
+
+It was downloaded from http://www.matroska.org/
+
+Upstream Author: Steve Lhomme <steve.lhomme@free.fr>
+
+Copyright (C) 2002-2003 Steve Lhomme.  All rights reserved.
+
+This file may be distributed under the terms of the Q Public License
+as defined by Trolltech AS of Norway and appearing in the file
+LICENSE.QPL included in the packaging of this file.
+
+This proram is also licensed under the GPL. See
+/usr/share/common-licenses/GPL for details.
+
+Licensees holding an other license may use this file in accordance with 
+the Agreement provided with the Software.
+
+This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+See http://www.matroska.org/license/qpl/ for QPL licensing information.
+
+Contact license@matroska.org if any conditions of this licensing are
+not clear to you.
--- a/debian/dirs
+++ b/debian/dirs
@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
--- a/debian/docs
+++ b/debian/docs
--- a/debian/libmatroska-dev.dirs
+++ b/debian/libmatroska-dev.dirs
@ -0,0 +1,2 @@
+usr/lib
+usr/include
--- a/debian/libmatroska-dev.files
+++ b/debian/libmatroska-dev.files
@ -0,0 +1,2 @@
+usr/include/*
+usr/lib/lib*.a
--- a/debian/rules
+++ b/debian/rules
@ -0,0 +1,95 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
+
+# shared library versions, option 1
+version=2.0.5
+major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+# configure: configure-stamp
+# configure-stamp:
+# 	dh_testdir
+# 	# Add here commands to configure the package.
+
+# 	touch configure-stamp
+
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) LIBEBML_INCLUDE_DIR=/usr/include/ebml staticlib
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp
+	$(MAKE) -C make/linux prefix=$(CURDIR)/debian/tmp/usr \
+		install_headers install_staticlib
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_movefiles
+
+#	dh_installdebconf	
+	dh_installdocs
+#	dh_installexamples
+#	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installman
+#	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs ChangeLog
+	dh_link
+#	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+#	dh_perl
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- a/libmatroska.pc.in
+++ b/libmatroska.pc.in
@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name:             libmatroska
-Description:      Library for parsing EBML data structures
-Version:          @PACKAGE_VERSION@
-Requires.private: libebml
-Libs:             -L${libdir} -lmatroska
-Cflags:           -I${includedir}
--- a/m4/.gitignore
+++ b/m4/.gitignore
@ -1,2 +0,0 @@
-/libtool.m4
-/lt*.m4
--- a/make/Doxyfile
+++ b/make/Doxyfile
@ -0,0 +1,211 @@
+# Doxyfile 1.3
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = libmatroska
+PROJECT_NUMBER         = 0.5.0
+OUTPUT_DIRECTORY       = ../../doc/src
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = YES
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = YES
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+SHORT_NAMES            = NO
+HIDE_SCOPE_NAMES       = NO
+VERBATIM_HEADERS       = YES
+SHOW_INCLUDE_FILES     = NO
+JAVADOC_AUTOBRIEF      = YES
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = YES
+INHERIT_DOCS           = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = NO
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 2
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ALIASES                = 
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = ../../libebml/src \
+                         ../../libebml/src/platform/win32 \
+                         ../../libebml/ebml \
+                         ../../libebml/ebml/c \
+                         ../src \
+												 ../matroska \
+                         ../matroska/c
+FILE_PATTERNS          = *.cpp \
+                         *.h
+RECURSIVE              = NO
+EXCLUDE                = 
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = YES
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = NO
+REFERENCES_RELATION    = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = libmatroska.css
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               = 
+HHC_LOCATION           = 
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = YES
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = YES
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = YES
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = YES
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = YES
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = YES
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_SCHEMA             = 
+XML_DTD                = 
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX = 
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+TEMPLATE_RELATIONS     = YES
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
+CGI_NAME               = search.cgi
+CGI_URL                = 
+DOC_URL                = 
+DOC_ABSPATH            = 
+BIN_ABSPATH            = /usr/local/bin/
+EXT_DOC_PATHS          = 
--- a/make/cygwin/Makefile
+++ b/make/cygwin/Makefile
@ -0,0 +1,60 @@
+# libmatroska core Makefile (used in cygwin)
+# $Id: Makefile 640 2004-07-09 21:05:36Z mosu $
+
+# Options
+EXTENSION=.cpp
+CXXFLAGS=-g -DDEBUG -Wall -Wno-unknown-pragmas -DWIN32 -DNO_NAMESPACE
+LDFLAGS=
+
+SRC_DIR=../../src/
+
+# Programs
+CXX=g++ -c
+LD=g++
+DEP=$(CXX) -MM
+DEPEND = makedepend
+AR = ar rcvu
+RANLIB = ranlib
+
+# Librarires
+INCLUDE=
+LIBS=
+
+# Names
+PROGRAM=libmatroska.a
+
+# source-files
+sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
+
+# header files; replace .cxx extension with .h
+headers:=$(patsubst %$(EXTENSION),%.hpp,$(sources))
+
+# files holding dependency information; replace .cxx extension with .dep
+dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
+
+# object files; replace .cxx extension with .o
+objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+
+DEPENDFLAGS  = ${CXXFLAGS} ${INCLUDE}
+
+# Build rules
+%.o: %$(EXTENSION)
+	$(CXX) $(CXXFLAGS) $(INCLUDE) -o $@ $<
+
+$(PROGRAM): $(objects)
+	$(AR) $@ $(objects)
+	$(RANLIB) $@
+#	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+#	${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
+
+clean:
+	rm -f ${SRC_DIR}$(objects)
+	rm -f ${SRC_DIR}$(dependencies)
+	rm -f ${SRC_DIR}$(PROGRAM)
+	rm -f CORE
+
+# what are the source dependencies
+depend: $(sources)
+	$(DEPEND) $(DEPENDFLAGS) $(sources)
+
+# DO NOT DELETE
--- a/make/cygwin/Makefile.rule
+++ b/make/cygwin/Makefile.rule
@ -0,0 +1,98 @@
+##
+## This Makefile is made for cygwin, but might probably work on any standard UNIX too
+##
+
+#****************************************************************************
+
+# DEBUG can be set to YES to include debugging info, or NO otherwise
+DEBUG          = YES
+
+# PROFILE can be set to YES to include profiling info, or NO otherwise
+PROFILE        = NO
+
+#****************************************************************************
+
+CC     = gcc
+CXX    = g++
+LD     = gcc
+AR     = ar rcvu
+RANLIB = ranlib
+DEPEND = makedepend
+INDENT =indent --gnu-style -ut -ts6 -br -npsl -npcs
+DELETE =rm -f
+
+GLOBAL_CFLAGS   = -Wall -Wno-unknown-pragmas -Wno-format 
+DEBUG_CFLAGS    = -g -O0 -DDEBUG ${GLOBAL_CFLAGS}
+RELEASE_CFLAGS  =  -O2 ${GLOBAL_CFLAGS}
+
+P_OPTIONS = -pedantic
+
+LIBS =
+
+DEBUG_CXXFLAGS   = ${DEBUG_CFLAGS}
+RELEASE_CXXFLAGS = ${RELEASE_CFLAGS}
+
+DEBUG_LDFLAGS    = -g
+RELEASE_LDFLAGS  =
+
+ifeq (YES, ${DEBUG})
+   CFLAGS       = ${DEBUG_CFLAGS} ${INCS} ${P_OPTIONS}
+   CXXFLAGS     = ${DEBUG_CXXFLAGS} ${INCS} ${P_OPTIONS}
+   LDFLAGS      = ${DEBUG_LDFLAGS}
+   DEPENDFLAGS  = ${DEBUG_CFLAGS} ${INCS}
+else
+   CFLAGS       = ${RELEASE_CFLAGS} ${INCS} ${P_OPTIONS}
+   CXXFLAGS     = ${RELEASE_CXXFLAGS} ${INCS} ${P_OPTIONS}
+   LDFLAGS      = ${RELEASE_LDFLAGS}
+   DEPENDFLAGS  = ${RELEASE_CFLAGS} ${INCS}
+endif
+
+ifeq (YES, ${PROFILE})
+   CFLAGS   := ${CFLAGS} -pg
+   CXXFLAGS := ${CXXFLAGS} -pg
+   LDFLAGS  := ${LDFLAGS} -pg
+endif
+
+#****************************************************************************
+# Preprocessor directives
+#****************************************************************************
+
+ifeq (YES, ${PROFILE})
+  DEFS =
+else
+  DEFS =
+endif
+
+#****************************************************************************
+# Include paths
+#****************************************************************************
+
+#INCS := -I/usr/include/g++-2 -I/usr/local/include
+#INCS =
+
+
+#****************************************************************************
+# Makefile code common to all platforms
+#****************************************************************************
+
+CFLAGS   := ${CFLAGS}   ${DEFS}
+CXXFLAGS := ${CXXFLAGS} ${DEFS}
+
+#****************************************************************************
+# General rules
+#****************************************************************************
+
+indent:
+	$(INDENT) --line-length 100 ${SRCS} ${SRCS_HEADERS}
+	$(DELETE) *.*~
+
+indent80:
+	$(INDENT) --line-length 80 ${SRCS} ${SRCS_HEADERS}
+	$(DELETE) *.*~
+
+clean:
+	rm -f core *.o *.so *.a *.exe
+
+# what are the source dependencies
+depend: $(SRCS)
+	$(DEPEND) $(DEPENDFLAGS) $(SRCS)
--- a/make/linux/Makefile
+++ b/make/linux/Makefile
@ -0,0 +1,178 @@
+# libmatroska core Makefile (used in cygwin)
+# $Id: Makefile 1254 2006-06-02 14:32:52Z mosu $
+# Author: Steve Lhomme <robux4 @ users.sf.net>
+# Author: Moritz Bunkus <moritz @ bunkus.org>
+
+#
+# The library is built without debug information. If you want
+# debug information to be included then compile with
+# 'make DEBUG=yes'.
+#
+
+# Paths
+# BeOS wants the libs and headers in /boot/home/config
+ifeq (BeOS,$(shell uname -s))
+prefix=/boot/home/config
+else
+prefix=/usr/local
+endif
+libdir=$(prefix)/lib
+includedir=$(prefix)/include/matroska
+
+# Programs
+CROSS =
+CXX = $(CROSS)g++
+LD = $(CXX)
+AR = $(CROSS)ar
+RANLIB = $(CROSS)ranlib
+INSTALL = install
+INSTALL_OPTS = -m 644
+INSTALL_OPTS_LIB = -m 644
+INSTALL_DIR_OPTS = -m 755
+
+CWD=$(shell pwd)
+
+# Options
+LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
+LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
+EXTENSION=.cpp
+
+ifeq (yes,$(DEBUG))
+DEBUGFLAGS=-g -DDEBUG
+endif
+
+SRC_DIR=$(CWD)/../../src/
+INCLUDE_DIR=$(CWD)/../../matroska
+MUX_SRC_DIR=$(CWD)/../../test/mux/
+TAG_SRC_DIR=$(CWD)/../../test/tags/
+
+# Librarires
+INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
+LIBS=
+MUX_LIBS=-lmatroska -lebml $(LIBICONV)
+
+# Names
+LIBRARY=libmatroska.a
+LIBRARY_SO=libmatroska.so
+LIBRARY_SO_VER=libmatroska.so.5
+
+# source-files
+sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
+
+# header files; replace .cxx extension with .h
+headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
+
+# object files; replace .cxx extension with .o
+objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+
+objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
+
+WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
+		-Wshadow
+COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
+LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
+DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
+
+ifeq (Darwin,$(shell uname -s))
+all: staticlib
+else
+all: staticlib sharedlib
+endif
+
+staticlib: $(LIBRARY)
+
+sharedlib: $(LIBRARY_SO)
+
+lib:
+	@echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
+	@false
+
+# Build rules
+%.o: %$(EXTENSION)
+	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+
+%.lo: %$(EXTENSION)
+	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
+
+$(LIBRARY): $(objects)
+	$(AR) rcvu $@ $(objects)
+	$(RANLIB) $@
+
+$(LIBRARY_SO): $(objects_so)
+	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
+	rm -f $(LIBRARY_SO)
+	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+
+clean:	cleantest
+	rm -f $(objects) $(objects_so)
+	rm -f $(LIBRARY)
+	rm -f $(LIBRARY_SO)
+	rm -f $(LIBRARY_SO_VER)
+	rm -f CORE
+
+cleantest:
+	rm -f test6 test8 test9 test6.o test8.o test9.o
+
+distclean dist-clean: clean
+	rm -f .depend
+
+depend:
+	@echo Calculating dependecies:
+	@rm -f .depend
+	@touch .depend
+	@for i in $(sources); do \
+		o="`echo $$i | sed -e 's/\.c$$/.o/' -e 's/\.cpp$$/.o/'`" ; \
+		echo '  ' $$i: $$o ; \
+		$(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \
+	done
+
+test: test6 test9
+
+test6:	test6.o $(LIBRARY) $(LIBRARY_SO)
+	$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+
+test6.o: $(MUX_SRC_DIR)test6.cpp
+	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+
+test8:	test8.o $(LIBRARY) $(LIBRARY_SO)
+	$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+
+test8.o: $(MUX_SRC_DIR)test8.cpp
+	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+
+test9:	test9.o $(LIBRARY) $(LIBRARY_SO)
+	$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
+
+test9.o: $(TAG_SRC_DIR)test9.cpp
+	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+
+ifeq (Darwin,$(shell uname -s))
+install: install_staticlib install_headers
+else
+install: install_staticlib install_sharedlib install_headers
+endif
+
+install_headers:
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+	for i in $(INCLUDE_DIR)/*.h; do \
+		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
+	done
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
+	for i in $(INCLUDE_DIR)/c/*.h; do \
+		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
+	done
+
+install_staticlib: $(LIBRARY)
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+
+install_sharedlib: $(LIBRARY_SO)
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
+	ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+
+ifneq ($(wildcard .depend),)
+include .depend
+endif
+
+# DO NOT DELETE
--- a/make/linux/Makefile.rule
+++ b/make/linux/Makefile.rule
@ -0,0 +1,98 @@
+##
+## This Makefile is made for cygwin, but might probably work on any standard UNIX too
+##
+
+#****************************************************************************
+
+# DEBUG can be set to YES to include debugging info, or NO otherwise
+DEBUG          = YES
+
+# PROFILE can be set to YES to include profiling info, or NO otherwise
+PROFILE        = NO
+
+#****************************************************************************
+
+CC     = gcc
+CXX    = g++
+LD     = gcc
+AR     = ar rcvu
+RANLIB = ranlib
+DEPEND = makedepend
+INDENT =indent --gnu-style -ut -ts6 -br -npsl -npcs
+DELETE =rm -f
+
+GLOBAL_CFLAGS   = -Wall -Wno-unknown-pragmas -Wno-format 
+DEBUG_CFLAGS    = -g -O0 -DDEBUG ${GLOBAL_CFLAGS}
+RELEASE_CFLAGS  =  -O2 ${GLOBAL_CFLAGS}
+
+P_OPTIONS = -pedantic
+
+LIBS =
+
+DEBUG_CXXFLAGS   = ${DEBUG_CFLAGS}
+RELEASE_CXXFLAGS = ${RELEASE_CFLAGS}
+
+DEBUG_LDFLAGS    = -g
+RELEASE_LDFLAGS  =
+
+ifeq (YES, ${DEBUG})
+   CFLAGS       = ${DEBUG_CFLAGS} ${INCS} ${P_OPTIONS}
+   CXXFLAGS     = ${DEBUG_CXXFLAGS} ${INCS} ${P_OPTIONS}
+   LDFLAGS      = ${DEBUG_LDFLAGS}
+   DEPENDFLAGS  = ${DEBUG_CFLAGS} ${INCS}
+else
+   CFLAGS       = ${RELEASE_CFLAGS} ${INCS} ${P_OPTIONS}
+   CXXFLAGS     = ${RELEASE_CXXFLAGS} ${INCS} ${P_OPTIONS}
+   LDFLAGS      = ${RELEASE_LDFLAGS}
+   DEPENDFLAGS  = ${RELEASE_CFLAGS} ${INCS}
+endif
+
+ifeq (YES, ${PROFILE})
+   CFLAGS   := ${CFLAGS} -pg
+   CXXFLAGS := ${CXXFLAGS} -pg
+   LDFLAGS  := ${LDFLAGS} -pg
+endif
+
+#****************************************************************************
+# Preprocessor directives
+#****************************************************************************
+
+ifeq (YES, ${PROFILE})
+  DEFS =
+else
+  DEFS =
+endif
+
+#****************************************************************************
+# Include paths
+#****************************************************************************
+
+#INCS := -I/usr/include/g++-2 -I/usr/local/include
+#INCS =
+
+
+#****************************************************************************
+# Makefile code common to all platforms
+#****************************************************************************
+
+CFLAGS   := ${CFLAGS}   ${DEFS}
+CXXFLAGS := ${CXXFLAGS} ${DEFS}
+
+#****************************************************************************
+# General rules
+#****************************************************************************
+
+indent:
+	$(INDENT) --line-length 100 ${SRCS} ${SRCS_HEADERS}
+	$(DELETE) *.*~
+
+indent80:
+	$(INDENT) --line-length 80 ${SRCS} ${SRCS_HEADERS}
+	$(DELETE) *.*~
+
+clean:
+	rm -f core *.o *.so *.a *.exe
+
+# what are the source dependencies
+depend: $(SRCS)
+	$(DEPEND) $(DEPENDFLAGS) $(SRCS)
--- a/make/linux/check_ids
+++ b/make/linux/check_ids
@ -4,7 +4,7 @@
 # source files.

 echo 'Duplicate IDs:'
-grep -h '^EbmlId.*_TheId' src/*cpp | \
+grep -h '^EbmlId.*_TheId' ../../src/*cpp | \
  sed -e 's/TheId/TheId /' | \
  awk '{ print $3 }' | \
  sed -e 's/(//' -e 's/,//' | \
@ -13,6 +13,6 @@ grep -h '^EbmlId.*_TheId' src/*cpp | \
 ( while read id ; do
    echo ''
    echo ${id}:
-    grep -i $id src/*cpp
+    grep -i $id ../../src/*cpp
  done )

--- a/make/linux/fedora-core.spec
+++ b/make/linux/fedora-core.spec
@ -0,0 +1,61 @@
+# SPEC file for (at least) Fedora Core 1, 2, 3
+
+Name: 		libmatroska
+Version: 1.3.0
+Release: 1
+License: 	LGPL
+Summary:	Matroska Video Container
+Group:		System Environment/Libraries
+URL: 		http://www.matroska.org/
+Vendor:         Moritz Bunkus <moritz@bunkus.org>
+Source: 	http://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.bz2
+BuildRoot: 	%{_tmppath}/%{name}-root
+
+%description
+Matroska aims to become THE Standard of Multimedia Container Formats.
+It was derived from a project called MCF, but differentiates from it
+significantly because it is based on  EBML (Extensible Binary Meta
+Language), a binary derivative of XML. EBML enables the Matroska
+Development Team to gain significant advantages in terms of future
+format extensibility, without breaking file support in old parsers.
+
+%package devel
+Summary:	Matroska Video Container headers/development files
+Group:		Development/Libraries
+
+%description devel
+Headers for libmatroska.
+
+%prep
+%setup -q
+
+%build
+cd make/linux
+CFLAGS="$RPM_OPT_FLAGS" \
+make \
+prefix="%{_prefix}" \
+LIBEBML_INCLUDE_DIR=%{_includedir} \
+LIBEBML_LIB_DIR=%{_libdir} \
+staticlib
+cd ../..
+
+%install
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+cd make/linux
+make prefix=$RPM_BUILD_ROOT/%{_prefix} libdir=$RPM_BUILD_ROOT/%{_libdir} install_staticlib install_headers
+cd ../..
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+%files devel
+%defattr(-, root, root)
+%{_includedir}/matroska/*.h
+%{_includedir}/matroska/c/*.h
+%{_libdir}/libmatroska.a
+
+%changelog
+* Sat Apr 16 2005 Moritz Bunkus <moritz@bunkus.org>
+- updated for the new libmatroska build targets
+* Fri May 15 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+- create spec file
--- a/make/linux/suse.spec
+++ b/make/linux/suse.spec
@ -0,0 +1,73 @@
+#
+# spec file for package libmatroska for (at least) SuSE 9.0, 9.1
+#
+# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://www.suse.de/feedback/
+#
+
+# neededforbuild  gcc-c++ libebml libstdc++-devel
+
+BuildRequires: bzip2 cpp libebml make tar zlib zlib-devel binutils gcc gcc-c++ libstdc++-devel perl rpm
+
+Name:         libmatroska
+URL:          http://dl.matroska.org/downloads/libmatroska/
+Version: 1.3.0
+Release: 1
+Summary:      library to deal with matroska files.
+License:      LGPL
+Group:        Development/Libraries/Other
+Source:       %{name}-%{version}.tar.bz2
+Summary:      library to deal with matroska files.
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Prefix:       /usr
+
+%description
+libmatroska is a C++ libary to parse Matroska files (.mkv and .mka). It
+depends on libebml to work. You only need this package to compile your
+own applications.
+
+
+
+Authors:
+--------
+    Steve Lhomme <steve.lhomme@free.fr>
+    Moritz Bunkus <moritz@bunkus.org>
+
+%prep
+rm -rf $RPM_BUILD_ROOT
+%setup
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+cd make/linux
+make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} staticlib
+
+%install
+cd make/linux
+make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install_staticlib install_headers
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%run_ldconfig
+
+%postun
+%run_ldconfig
+
+%files
+%defattr (-,root,root)
+%{_libdir}/libmatroska.a
+/usr/include/matroska
+# /usr/include/ebml/*
+
+%changelog -n libmatroska
+* Sat Apr 16 2005 - moritz@bunkus.org
+- updated for the new libmatroska build targets
+* Thu Sep 02 2004 - seife@suse.de
+- add libebml to neededforbuild
+* Wed Sep 01 2004 - seife@suse.de
+- initial submission
--- a/make/macosx/macosx.pbproj/project.pbxproj
+++ b/make/macosx/macosx.pbproj/project.pbxproj
--- a/make/makedoc.bat
+++ b/make/makedoc.bat
@ -0,0 +1,8 @@
+@echo off
+rem you should have DOXYGEN.EXE in your path
+rem http://www.doxygen.org/
+
+echo make Documentation
+
+
+doxygen Doxyfile > Doxygen.log.txt 2> Doxygen.err.txt
--- a/make/makedoc.sh
+++ b/make/makedoc.sh
@ -0,0 +1,7 @@
+#!/usr/bin/sh
+# you should have "doxygen" in your path
+# http://www.doxygen.org/
+
+echo make Documentation
+
+doxygen Doxyfile > Doxygen.log.txt 2> Doxygen.err.txt
--- a/make/mingw32/Makefile
+++ b/make/mingw32/Makefile
@ -0,0 +1,112 @@
+# Project: libmatroska
+# Makefile created by Dev-C++ 4.9.7.0
+
+# Normally libmatroska is built as a static library.
+# Uncomment this if you want a shared library instead.
+# ATTENTION: Your app has to define MATROSKA_DLL !
+SHARED = yes
+
+# Compile with debug information?
+#DEBUG = yes
+
+# Where libebml resides
+EBML_DIR = ../../../libebml
+
+# Has libebml been compiled as a DLL?
+EBML_DLL = yes
+
+#
+# Don't change anything below this line.
+#
+ifeq (yes,$(DEBUG))
+DEBUGFLAGS=-g -DDEBUG
+endif
+CROSS   =
+CXX     = $(CROSS)g++
+CC      = $(CROSS)gcc
+WINDRES = $(CROSS)windres
+RANLIB  = $(CROSS)ranlib
+AR      = $(CROSS)ar
+RES  =
+SRC  = $(wildcard ../../src/*.cpp)
+OBJ  = $(patsubst %.cpp,%.o,$(SRC))
+ifeq (yes,$(SHARED))
+LIBS = libmatroska.dll
+FLAGS = -DMATROSKA_DLL
+DLLFLAGS = -DMATROSKA_DLL_EXPORT
+else
+LIBS = libmatroska.a
+endif
+ifeq (yes,$(SHARED))
+ifeq (yes,$(EBML_DLL))
+FLAGS += -DEBML_DLL
+endif
+endif
+CWD = $(shell pwd)
+INCS = -I"$(CWD)/../.." -I$(EBML_DIR)
+LDFLAGS = -L. -L$(EBML_DIR)/make/mingw32
+COMPILEFLAGS = $(DEBUGFLAGS) $(INCS) $(FLAGS) $(CXXFLAGS)
+TESTS = test6 test8 test9
+
+.PHONY: all all-before all-after clean clean-custom
+
+.cpp.o:
+	$(CXX) $(DLLFLAGS) $(COMPILEFLAGS) -c -o $@ $<
+
+all: lib
+
+lib: $(LIBS)
+
+tests: $(TESTS)
+
+clean:
+	rm -f $(OBJ) libmatroska.a libmatroska.dll.a libmatroska.dll *.exe \
+		../../test/mux/*.o ../../test/tags/*.o
+
+distclean dist-clean: clean
+	rm -f .depend
+
+libmatroska.a: $(OBJ)
+	$(AR) rcvu $@ $(OBJ)
+	$(RANLIB) $@
+
+libmatroska.dll: $(OBJ)
+	$(CXX) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ) \
+		$(LDFLAGS) -lebml
+
+# Explicitely list these object files because for them
+# MATROSKA_DLL_EXPORT must NOT be defined.
+../../test/mux/test6.o: ../../test/mux/test6.cpp
+	$(CXX) $(COMPILEFLAGS) -c -o $@ $<
+
+test6:	../../test/mux/test6.o $(LIBS)
+	$(LD) -o $@ $(LDFLAGS) $< -lmatroska -lebml
+
+../../test/mux/test8.o: ../../test/mux/test8.cpp
+	$(CXX) $(COMPILEFLAGS) -c -o $@ $<
+
+test8:	../../test/mux/test8.o $(LIBS)
+	$(LD) -o $@ $(LDFLAGS) $< -lmatroska -lebml
+
+../../test/tags/test9.o: ../../test/tags/test9.cpp
+	$(CXX) $(COMPILEFLAGS) -c -o $@ $<
+
+test9:	../../test/tags/test9.o $(LIBS)
+	$(LD) -o $@ $(LDFLAGS) $< -lmatroska -lebml
+
+depend:
+	@echo Calculating dependecies:
+	@rm -f .depend
+	@touch .depend
+	@for i in $(SRC); do \
+		o="`echo $$i | sed -e 's/\.c$$/.o/' -e 's/\.cpp$$/.o/'`" ; \
+		echo '  ' $$i: $$o ; \
+		$(CXX) $(COMPILEFLAGS) -MM -MT $$o $$i >> .depend ; \
+	done
+
+#
+# include dependency files if they exist
+#
+ifneq ($(wildcard .depend),)
+include .depend
+endif
--- a/make/mingw32/libmatroska.dev
+++ b/make/mingw32/libmatroska.dev
@ -0,0 +1,390 @@
+[Project]
+FileName=libmatroska.dev
+Name=libmatroska
+UnitCount=43
+Type=2
+Ver=1
+ObjFiles=
+Includes=..\..\..\libebml\src
+Libs=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Resources=
+Compiler=
+Linker=
+IsCpp=1
+Icon=
+ExeOutput=
+ObjectOutput=
+OverrideOutput=0
+OverrideOutputName=libmatroska.a
+HostApplication=
+Folders=
+CommandLine=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=000000000000000000
+
+[Unit1]
+FileName=..\..\src\StdInclude.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=..\..\src\FileKax.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=..\..\src\KaxAttached.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=..\..\src\KaxAttached.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=..\..\src\KaxAttachements.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit6]
+FileName=..\..\src\KaxAttachements.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=..\..\src\KaxBlock.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit8]
+FileName=..\..\src\KaxBlock.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=..\..\src\KaxBlockAdditional.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=..\..\src\KaxBlockAdditional.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit11]
+FileName=..\..\src\KaxChapters.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=..\..\src\KaxChapters.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=..\..\src\KaxCluster.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit14]
+FileName=..\..\src\KaxCluster.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=..\..\src\KaxClusterData.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit16]
+FileName=..\..\src\KaxClusterData.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=..\..\src\KaxConfig.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=..\..\src\KaxContexts.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=..\..\src\KaxContexts.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=..\..\src\KaxCues.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit21]
+FileName=..\..\src\KaxCues.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit22]
+FileName=..\..\src\KaxCuesData.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=..\..\src\KaxCuesData.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit24]
+FileName=..\..\src\KaxInfo.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=..\..\src\KaxInfo.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=..\..\src\KaxInfoData.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit27]
+FileName=..\..\src\KaxInfoData.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit28]
+FileName=..\..\src\KaxSeekHead.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit29]
+FileName=..\..\src\KaxSeekHead.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit30]
+FileName=..\..\src\KaxSegment.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=..\..\src\KaxSegment.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit32]
+FileName=..\..\src\KaxTrackAudio.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit33]
+FileName=..\..\src\KaxTrackAudio.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit34]
+FileName=..\..\src\KaxTrackEntryData.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit35]
+FileName=..\..\src\KaxTrackEntryData.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit36]
+FileName=..\..\src\KaxTracks.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit37]
+FileName=..\..\src\KaxTracks.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit38]
+FileName=..\..\src\KaxTrackVideo.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit39]
+FileName=..\..\src\KaxTrackVideo.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit40]
+FileName=..\..\src\KaxTypes.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit41]
+FileName=..\..\src\KaxVersion.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit42]
+FileName=..\..\src\KaxVersion.h
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit43]
+FileName=..\..\src\FileKax.cpp
+Folder=libmatroska
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=
+
--- a/make/mingw32/test/Makefile
+++ b/make/mingw32/test/Makefile
@ -0,0 +1,27 @@
+# Project: test6
+# Makefile created by Dev-C++ 4.9.7.0
+
+CPP  = g++.exe
+CC   = gcc.exe
+WINDRES = windres.exe
+RES  = 
+OBJ  = ../../../test/mux/test6.o $(RES)
+LIBS =  -L"D:/DEV-CPP/lib" "../libmatroska.a" "../../../../libebml/make/mingw32/libebml.a"
+INCS =  -I"D:/DEV-CPP/include"  -I"D:/DEV-CPP/include/c++"  -I"D:/DEV-CPP/include"  -I"D:/Dev-Cpp/include/c++/mingw32"  -I"../../../../libebml/src"  -I"../../../src" 
+BIN  = test6.exe
+CXXFLAGS = $(INCS) 
+CFLAGS = $(INCS) 
+
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before test6.exe all-after
+
+
+clean: clean-custom
+	rm -f $(OBJ) $(BIN)
+
+$(BIN): $(OBJ)
+	$(CPP) $(OBJ) -o "test6.exe" $(LIBS) $(CXXFLAGS)
+
+../../../test/mux/test6.o: ../../../test/mux/test6.cpp
+	$(CPP) -c ../../../test/mux/test6.cpp -o ../../../test/mux/test6.o $(CXXFLAGS)
--- a/make/mingw32/test/test6.dev
+++ b/make/mingw32/test/test6.dev
@ -0,0 +1,54 @@
+[Project]
+FileName=test6.dev
+Name=test6
+UnitCount=1
+Type=1
+Ver=1
+ObjFiles=
+Includes=..\..\..\..\libebml\src;..\..\..\src
+Libs=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Resources=
+Compiler=
+Linker="..\libmatroska.a" "..\..\..\..\libebml\make\mingw32\libebml.a"
+IsCpp=1
+Icon=
+ExeOutput=
+ObjectOutput=
+OverrideOutput=0
+OverrideOutputName=test6.exe
+HostApplication=
+Folders=
+CommandLine=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=000000000000000000
+
+[Unit1]
+FileName=..\..\..\test\mux\test6.cpp
+Folder=test6
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=
+
--- a/make/mingw32/test/test8.dev
+++ b/make/mingw32/test/test8.dev
@ -0,0 +1,54 @@
+[Project]
+FileName=test8.dev
+Name=test8
+UnitCount=1
+Type=1
+Ver=1
+ObjFiles=
+Includes=..\..\..\..\libebml\src;..\..\..\src
+Libs=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Resources=
+Compiler=
+Linker="..\libmatroska.a" "..\..\..\..\libebml\make\mingw32\libebml.a"
+IsCpp=1
+Icon=
+ExeOutput=
+ObjectOutput=
+OverrideOutput=0
+OverrideOutputName=test8.exe
+HostApplication=
+Folders=
+CommandLine=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=000000000000000000
+
+[Unit1]
+FileName=..\..\..\test\mux\test8.cpp
+Folder=test8
+Compile=1
+CompileCpp=1
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=
+
--- a/make/vc6/lib/static/libmatroska.dsp
+++ b/make/vc6/lib/static/libmatroska.dsp
@ -0,0 +1,284 @@
+# Microsoft Developer Studio Project File - Name="libmatroska" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libmatroska - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libmatroska.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libmatroska.mak" CFG="libmatroska - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libmatroska - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libmatroska - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libmatroska - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../../libebml" /I "../../../.." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "libmatroska - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../../../../libebml" /I "../../../.." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libmatroska - Win32 Release"
+# Name "libmatroska - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\src\FileKax.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxAttached.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxAttachments.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxBlock.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxBlockData.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxChapters.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxCluster.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxClusterData.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxContentEncoding.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxContexts.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxCues.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxCuesData.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxInfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxInfoData.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxSeekHead.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxSegment.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxTag.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxTags.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxTrackAudio.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxTrackEntryData.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxTracks.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxTrackVideo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\KaxVersion.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\FileKax.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxAttached.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxAttachments.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxBlock.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxBlockData.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxChapters.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxCluster.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxClusterData.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxConfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxContentEncoding.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxContexts.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxCues.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxCuesData.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxInfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxInfoData.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxSeekHead.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxSegment.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxTag.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxTags.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxTrackAudio.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxTrackEntryData.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxTracks.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxTrackVideo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxTypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\matroska\KaxVersion.h
+# End Source File
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test0.dsp
+++ b/make/vc6/test/test0.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test0" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test0 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test0.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test0.mak" CFG="test0 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test0 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test0 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test0 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../src" /I "../../../../libebml/src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test0 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../../src" /I "../../../../libebml/src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test0 - Win32 Release"
+# Name "test0 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\ebml\test0.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test00.dsp
+++ b/make/vc6/test/test00.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test00" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test00 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test00.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test00.mak" CFG="test00 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test00 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test00 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test00 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../src" /I "../../../../libebml/src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test00 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../../src" /I "../../../../libebml/src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test00 - Win32 Release"
+# Name "test00 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\ebml\test00.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test1.dsp
+++ b/make/vc6/test/test1.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test1" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test1 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test1.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test1.mak" CFG="test1 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test1 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test1 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test1 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test1 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test1 - Win32 Release"
+# Name "test1 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\block\test1.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test2.dsp
+++ b/make/vc6/test/test2.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test2" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test2 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test2.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test2.mak" CFG="test2 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test2 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test2 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test2 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test2 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test2 - Win32 Release"
+# Name "test2 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\cluster\test2.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test3.dsp
+++ b/make/vc6/test/test3.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test3" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test3 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test3.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test3.mak" CFG="test3 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test3 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test3 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test3 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test3 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test3 - Win32 Release"
+# Name "test3 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\endian\test3.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test4.dsp
+++ b/make/vc6/test/test4.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test4" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test4 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test4.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test4.mak" CFG="test4 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test4 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test4 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test4 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test4 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test4 - Win32 Release"
+# Name "test4 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\header\test4.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test5.dsp
+++ b/make/vc6/test/test5.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test5" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test5 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test5.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test5.mak" CFG="test5 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test5 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test5 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test5 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test5 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test5 - Win32 Release"
+# Name "test5 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\utf8\test5.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test6.dsp
+++ b/make/vc6/test/test6.dsp
@ -0,0 +1,101 @@
+# Microsoft Developer Studio Project File - Name="test6" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test6 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test6.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test6.mak" CFG="test6 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test6 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test6 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test6 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../.." /I "../../../../libebml" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test6 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../.." /I "../../../../libebml" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test6 - Win32 Release"
+# Name "test6 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\mux\test6.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test6c.dsp
+++ b/make/vc6/test/test6c.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test6c" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test6c - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test6c.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test6c.mak" CFG="test6c - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test6c - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test6c - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test6c - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../src/api/c" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test6c - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../src/api/c" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test6c - Win32 Release"
+# Name "test6c - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\..\..\test\mux\test6.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test7.dsp
+++ b/make/vc6/test/test7.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test7" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test7 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test7.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test7.mak" CFG="test7 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test7 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test7 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test7 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test7 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test7 - Win32 Release"
+# Name "test7 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\mux\test7.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test8.dsp
+++ b/make/vc6/test/test8.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test8" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test8 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test8.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test8.mak" CFG="test8 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test8 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test8 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test8 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../.." /I "../../../../libebml" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test8 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../.." /I "../../../../libebml" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test8 - Win32 Release"
+# Name "test8 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\mux\test8.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test8c.dsp
+++ b/make/vc6/test/test8c.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test8c" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test8c - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test8c.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test8c.mak" CFG="test8c - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test8c - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test8c - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test8c - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../src/api/c" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test8c - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../src/api/c" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test8c - Win32 Release"
+# Name "test8c - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\..\..\test\mux\test8.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/test/test9.dsp
+++ b/make/vc6/test/test9.dsp
@ -0,0 +1,100 @@
+# Microsoft Developer Studio Project File - Name="test9" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=test9 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "test9.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "test9.mak" CFG="test9 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "test9 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "test9 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "test9 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../.." /I "../../../../libebml" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "test9 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../.." /I "../../../../libebml" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "test9 - Win32 Release"
+# Name "test9 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\test\tags\test9.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/make/vc6/vc6.dsw
+++ b/make/vc6/vc6.dsw
@ -0,0 +1,134 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libebml"=..\..\..\libebml\make\vc6\lib\static\libebml.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libmatroska"=.\lib\static\libmatroska.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libebml
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "test0"=test\test0.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libebml
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libmatroska
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "test00"=test\test00.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libebml
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libmatroska
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "test6"=test\test6.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libebml
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libmatroska
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "test8"=test\test8.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libebml
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libmatroska
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "test9"=test\test9.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libebml
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libmatroska
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/make/vc7/Makefile
+++ b/make/vc7/Makefile
@ -0,0 +1,60 @@
+# Project: libmatroska
+# Makefile to use the Free Visual C++ 2003 compiler from Microsoft with GNU Make
+
+# Compile with debug information?
+#DEBUG = yes
+
+# Where libebml resides
+EBML_DIR = ../../../libebml
+
+#
+# Don't change anything below this line.
+#
+CXX  = cl /Tp
+CC   = cl /Tc
+SRC  = $(wildcard ../../src/*.cpp)
+OBJ  = $(patsubst %.cpp,%.obj,$(SRC))
+INCS = /I../.. /I$(EBML_DIR)
+LDFLAGS = /NOLOGO /DLL /MAP:libmatroska.map /LIBPATH:$(EBML_DIR)/make/vc7 /VERSION:0.7
+OPTMIZ = /G6 /O2 /Oi /GL /Wp64
+CXXFLAGS = $(INCS) /DWIN32 /nologo /DEBML_DLL 
+
+
+ifeq (yes,$(DEBUG))
+CXXFLAGS += /Zi /DDEBUG /D_DEBUG /MTd /RTC1
+LDFLAGS += /DEBUG
+else
+CXXFLAGS += /MT
+LDFLAGS += /OPT:REF
+endif
+
+LIBS = libmatroska.dll
+
+.PHONY: all all-before all-after clean clean-custom
+
+%.obj : %.cpp
+	$(CXX) $< /c $(CXXFLAGS) /Fo$@
+
+all: lib
+
+lib: $(LIBS)
+
+clean:
+	$(RM) $(OBJ) libmatroska.lib libmatroska.dll
+
+libmatroska.lib: $(OBJ)
+	lib /OUT:$@ /NODEFAULTLIB $(OBJ)
+
+libmatroska.dll: $(OBJ)
+	link $(LDFLAGS) /OUT:$@ $(OBJ) libebml.lib
+#	user32.lib
+
+depend:
+	$(CXX) $(CXXFLAGS) -MM $(SRC) > .depend
+
+#
+# include dependency files if they exist
+#
+ifneq ($(wildcard .depend),)
+include .depend
+endif
--- a/make/vc7/lib/dll/libmatroskadll.v71.vcproj
+++ b/make/vc7/lib/dll/libmatroskadll.v71.vcproj
@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="libmatroskadll"
+	ProjectGUID="{B227AC03-C69E-46B1-B91E-A77BE4C6F83A}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../../../libebml;../../../.."
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EBML_DLL;MATROSKA_DLL;MATROSKA_DLL_EXPORT"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/libmatroska.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/libmatroska.pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/libmatroska.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../../../../libebml;../../../.."
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EBML_DLL;MATROSKA_DLL;MATROSKA_DLL_EXPORT"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/libmatroska.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/libmatroska.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\..\..\src\KaxAttached.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxAttachments.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxBlock.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxBlockData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxChapters.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxCluster.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxClusterData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxContentEncoding.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxContexts.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxCues.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxCuesData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxInfo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxInfoData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxSeekHead.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxSegment.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTag.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTags.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTrackAudio.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTrackEntryData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTracks.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTrackVideo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxVersion.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\..\..\..\matroska\KaxAttached.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxAttachments.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxBlock.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxBlockData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxChapters.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxCluster.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxClusterData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxConfig.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxContentEncoding.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxContexts.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxCues.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxCuesData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxInfo.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxInfoData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxSeekHead.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxSegment.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTag.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTags.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTrackAudio.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTrackEntryData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTracks.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTrackVideo.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTypes.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxVersion.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/make/vc7/lib/static/libmatroska.v71.vcproj
+++ b/make/vc7/lib/static/libmatroska.v71.vcproj
@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="libmatroska"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../../../../libebml;../../../.."
+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/libmatroska.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Release\libmatroska.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../../../libebml;../../../.."
+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/libmatroska.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Debug\libmatroska.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\..\src\FileKax.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxAttached.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxAttachments.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxBlock.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxBlockData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxChapters.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxCluster.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxClusterData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxContentEncoding.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxContexts.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxCues.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxCuesData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxInfo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxInfoData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxSeekHead.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxSegment.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTag.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTags.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTrackAudio.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTrackEntryData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTracks.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTrackVideo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxVersion.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\..\..\..\matroska\FileKax.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxAttached.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxAttachments.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxBlock.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxBlockData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxChapters.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxCluster.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxClusterData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxConfig.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxContentEncoding.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxContexts.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxCues.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxCuesData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxInfo.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxInfoData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxSeekHead.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxSegment.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTag.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTags.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTrackAudio.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTrackEntryData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTracks.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTrackVideo.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTypes.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxVersion.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\StdInclude.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/make/vc7/lib/static/libmatroska.vcproj
+++ b/make/vc7/lib/static/libmatroska.vcproj
@ -0,0 +1,263 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="libmatroska"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../../../../libebml;../../../.."
+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/libmatroska.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Release\libmatroska.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../../../libebml;../../../.."
+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/libmatroska.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\Debug\libmatroska.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\..\src\FileKax.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxAttached.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxAttachments.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxBlock.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxBlockData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxChapters.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxCluster.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxClusterData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxContentEncoding.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxContexts.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxCues.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxCuesData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxInfo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxInfoData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxSeekHead.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxSegment.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTag.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTags.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTrackAudio.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTrackEntryData.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTrackVideo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxTracks.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KaxVersion.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\..\..\..\matroska\FileKax.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxAttached.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxAttachments.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxBlock.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxBlockData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxChapters.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxCluster.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxClusterData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxConfig.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxContentEncoding.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxContexts.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxCues.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxCuesData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxInfo.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxInfoData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxSeekHead.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxSegment.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTag.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTags.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTrackAudio.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTrackEntryData.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTrackVideo.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTracks.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxTypes.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\KaxVersion.h">
+			</File>
+			<File
+				RelativePath="..\..\..\..\matroska\StdInclude.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/make/vc7/test/test0.vcproj
+++ b/make/vc7/test/test0.vcproj
@ -0,0 +1,143 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="test0"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../src,../../../../libebml/src"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/test0.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile=".\Debug/test0.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/test0.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/test0.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../../src,../../../../libebml/src"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/test0.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile=".\Release/test0.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				ProgramDatabaseFile=".\Release/test0.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/test0.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\test\ebml\test0.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+	</Files>
+	<Globals>
+		<Global
+			Name="DevPartner_IsInstrumented"
+			Value="0"/>
+	</Globals>
+</VisualStudioProject>
--- a/make/vc7/test/test00.vcproj
+++ b/make/vc7/test/test00.vcproj
@ -0,0 +1,143 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="test00"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../src,../../../../libebml/src"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/test00.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile=".\Debug/test00.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/test00.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/test00.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../../src,../../../../libebml/src"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/test00.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile=".\Release/test00.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				ProgramDatabaseFile=".\Release/test00.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/test00.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\test\ebml\test00.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+	</Files>
+	<Globals>
+		<Global
+			Name="DevPartner_IsInstrumented"
+			Value="0"/>
+	</Globals>
+</VisualStudioProject>
--- a/make/vc7/test/test6.vcproj
+++ b/make/vc7/test/test6.vcproj
@ -0,0 +1,140 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="test6"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../..,../../../../libebml"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/test6.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile=".\Debug/test6.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/test6.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/test6.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../..,../../../../libebml"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/test6.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile=".\Release/test6.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				ProgramDatabaseFile=".\Release/test6.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/test6.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\test\mux\test6.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/make/vc7/test/test8.vcproj
+++ b/make/vc7/test/test8.vcproj
@ -0,0 +1,140 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="test8"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../..,../../../../libebml"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/test8.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile=".\Release/test8.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				ProgramDatabaseFile=".\Release/test8.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/test8.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../..,../../../../libebml"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/test8.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile=".\Debug/test8.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/test8.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/test8.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\test\mux\test8.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/make/vc7/test/test9.vcproj
+++ b/make/vc7/test/test9.vcproj
@ -0,0 +1,141 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="test9"
+	ProjectGUID="{F294A3C5-D355-49E7-A8B8-B9692345A5E0}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../..,../../../../libebml"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/test9.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile=".\Release/test9.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				ProgramDatabaseFile=".\Release/test9.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/test9.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../..,../../../../libebml"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/test9.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile=".\Debug/test9.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/test9.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/test9.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\test\tags\test9.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/make/vc7/vc7.sln
+++ b/make/vc7/vc7.sln
@ -0,0 +1,73 @@
+Microsoft Visual Studio Solution File, Format Version 7.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libebml", "..\..\..\libebml\make\vc7\lib\libebml.vcproj", "{C6902997-CF7C-42B5-AD42-5B7C11F4CFE6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libebmldll", "..\..\..\libebml\make\vc7\dll\libebmldll.v71.vcproj", "{83136D19-2749-4640-AC38-33E0B1F0DCC2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmatroska", "lib\static\libmatroska.vcproj", "{061EEA22-F7D5-4477-AB15-0DCE85EA038A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test0", "test\test0.vcproj", "{8380F3AF-9E4A-4D5F-900F-991978CE44E1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test00", "test\test00.vcproj", "{78DA23EF-794A-4311-9B99-8C71D44CC749}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test6", "test\test6.vcproj", "{4770FB10-8B2F-4E29-BA0B-517031ABC0F5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test8", "test\test8.vcproj", "{EAE085B0-7FD7-48DA-ABFE-A706DACC3794}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test9", "test\test9.vcproj", "{F294A3C5-D355-49E7-A8B8-B9692345A5E0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmatroskadll", "lib\dll\libmatroskadll.v71.vcproj", "{B227AC03-C69E-46B1-B91E-A77BE4C6F83A}"
+EndProject
+Global
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
+	GlobalSection(DevPartner Solution Properties) = postSolution
+	EndGlobalSection
+	GlobalSection(SolutionConfiguration) = preSolution
+		ConfigName.0 = Debug
+		ConfigName.1 = Release
+	EndGlobalSection
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{C6902997-CF7C-42B5-AD42-5B7C11F4CFE6}.Debug.ActiveCfg = Debug|Win32
+		{C6902997-CF7C-42B5-AD42-5B7C11F4CFE6}.Debug.Build.0 = Debug|Win32
+		{C6902997-CF7C-42B5-AD42-5B7C11F4CFE6}.Release.ActiveCfg = Release|Win32
+		{C6902997-CF7C-42B5-AD42-5B7C11F4CFE6}.Release.Build.0 = Release|Win32
+		{061EEA22-F7D5-4477-AB15-0DCE85EA038A}.Debug.ActiveCfg = Debug|Win32
+		{061EEA22-F7D5-4477-AB15-0DCE85EA038A}.Debug.Build.0 = Debug|Win32
+		{061EEA22-F7D5-4477-AB15-0DCE85EA038A}.Release.ActiveCfg = Release|Win32
+		{061EEA22-F7D5-4477-AB15-0DCE85EA038A}.Release.Build.0 = Release|Win32
+		{8380F3AF-9E4A-4D5F-900F-991978CE44E1}.Debug.ActiveCfg = Debug|Win32
+		{8380F3AF-9E4A-4D5F-900F-991978CE44E1}.Release.ActiveCfg = Release|Win32
+		{78DA23EF-794A-4311-9B99-8C71D44CC749}.Debug.ActiveCfg = Debug|Win32
+		{78DA23EF-794A-4311-9B99-8C71D44CC749}.Release.ActiveCfg = Release|Win32
+		{4770FB10-8B2F-4E29-BA0B-517031ABC0F5}.Debug.ActiveCfg = Debug|Win32
+		{4770FB10-8B2F-4E29-BA0B-517031ABC0F5}.Debug.Build.0 = Debug|Win32
+		{4770FB10-8B2F-4E29-BA0B-517031ABC0F5}.Release.ActiveCfg = Release|Win32
+		{4770FB10-8B2F-4E29-BA0B-517031ABC0F5}.Release.Build.0 = Release|Win32
+		{EAE085B0-7FD7-48DA-ABFE-A706DACC3794}.Debug.ActiveCfg = Debug|Win32
+		{EAE085B0-7FD7-48DA-ABFE-A706DACC3794}.Debug.Build.0 = Debug|Win32
+		{EAE085B0-7FD7-48DA-ABFE-A706DACC3794}.Release.ActiveCfg = Release|Win32
+		{EAE085B0-7FD7-48DA-ABFE-A706DACC3794}.Release.Build.0 = Release|Win32
+		{F294A3C5-D355-49E7-A8B8-B9692345A5E0}.Debug.ActiveCfg = Debug|Win32
+		{F294A3C5-D355-49E7-A8B8-B9692345A5E0}.Debug.Build.0 = Debug|Win32
+		{F294A3C5-D355-49E7-A8B8-B9692345A5E0}.Release.ActiveCfg = Release|Win32
+		{F294A3C5-D355-49E7-A8B8-B9692345A5E0}.Release.Build.0 = Release|Win32
+		{B227AC03-C69E-46B1-B91E-A77BE4C6F83A}.Debug.ActiveCfg = Debug|Win32
+		{B227AC03-C69E-46B1-B91E-A77BE4C6F83A}.Debug.Build.0 = Debug|Win32
+		{B227AC03-C69E-46B1-B91E-A77BE4C6F83A}.Release.ActiveCfg = Release|Win32
+		{B227AC03-C69E-46B1-B91E-A77BE4C6F83A}.Release.Build.0 = Release|Win32
+		{83136D19-2749-4640-AC38-33E0B1F0DCC2}.Debug.ActiveCfg = Debug|Win32
+		{83136D19-2749-4640-AC38-33E0B1F0DCC2}.Debug.Build.0 = Debug|Win32
+		{83136D19-2749-4640-AC38-33E0B1F0DCC2}.Release.ActiveCfg = Release|Win32
+		{83136D19-2749-4640-AC38-33E0B1F0DCC2}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+	GlobalSection(DevPartner) = postSolution
+	EndGlobalSection
+	GlobalSection(DevPartner) = postSolution
+	EndGlobalSection
+EndGlobal
--- a/matroska/FileKax.h
+++ b/matroska/FileKax.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxAttached.h
+++ b/matroska/KaxAttached.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxAttachments.h
+++ b/matroska/KaxAttachments.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxBlock.h
+++ b/matroska/KaxBlock.h
@ -17,9 +17,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -70,7 +70,7 @@ class MATROSKA_DLL_API DataBuffer {
 		{
 			if (bInternalBuffer)
 			{
-        myBuffer = new (std::nothrow) binary[mySize];
+				myBuffer = new binary[mySize];
 				if (myBuffer == NULL)
 					bValidValue = false;
 				else
@ -84,7 +84,7 @@ class MATROSKA_DLL_API DataBuffer {
 		virtual binary * Buffer() {assert(bValidValue); return myBuffer;}
 		virtual uint32   & Size() {return mySize;};
 		virtual const binary * Buffer() const {assert(bValidValue); return myBuffer;}
-    virtual uint32   Size()   const {return mySize;};
+		virtual const uint32   Size()   const {return mySize;};
 		bool    FreeBuffer(const DataBuffer & aBuffer) {
 			bool bResult = true;
 			if (myBuffer != NULL && bValidValue) {
@ -305,6 +305,7 @@ class MATROSKA_DLL_API KaxSimpleBlock : public KaxInternalBlock {
 		bool IsKeyframe() const    { return bIsKeyframe; }
 		bool IsDiscardable() const { return bIsDiscardable; }

+		operator KaxInternalBlock &() { return *this; }
 		void SetParent(KaxCluster & aParentCluster);

        EBML_CONCRETE_CLASS(KaxSimpleBlock)
--- a/matroska/KaxBlockData.h
+++ b/matroska/KaxBlockData.h
@ -17,9 +17,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxChapters.h
+++ b/matroska/KaxChapters.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxCluster.h
+++ b/matroska/KaxCluster.h
@ -17,9 +17,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxClusterData.h
+++ b/matroska/KaxClusterData.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxConfig.h
+++ b/matroska/KaxConfig.h
@ -17,9 +17,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxContentEncoding.h
+++ b/matroska/KaxContentEncoding.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxContexts.h
+++ b/matroska/KaxContexts.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxCues.h
+++ b/matroska/KaxCues.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxCuesData.h
+++ b/matroska/KaxCuesData.h
@ -17,9 +17,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxDefines.h
+++ b/matroska/KaxDefines.h
@ -17,9 +17,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxInfo.h
+++ b/matroska/KaxInfo.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxInfoData.h
+++ b/matroska/KaxInfoData.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxSeekHead.h
+++ b/matroska/KaxSeekHead.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxSegment.h
+++ b/matroska/KaxSegment.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxSemantic.h
+++ b/matroska/KaxSemantic.h
@ -20,9 +20,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -157,9 +157,6 @@ public:

 DECLARE_MKX_BINARY (KaxCodecState)
 };
-
-DECLARE_MKX_SINTEGER(KaxDiscardPadding)
-};
 #endif

 DECLARE_MKX_MASTER(KaxSlices)
@ -246,14 +243,7 @@ DECLARE_MKX_UINTEGER(KaxTrackMaxCache)
 DECLARE_MKX_UINTEGER(KaxTrackDefaultDuration)
 };

-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_UINTEGER(KaxTrackDefaultDecodedFieldDuration)
-};
-#endif
-
 DECLARE_MKX_FLOAT(KaxTrackTimecodeScale)
-public:
-  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };

 #if MATROSKA_VERSION >= 2
@ -307,14 +297,6 @@ DECLARE_MKX_UINTEGER(KaxCodecDecodeAll)
 DECLARE_MKX_UINTEGER(KaxTrackOverlay)
 };

-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_UINTEGER(KaxCodecDelay)
-};
-
-DECLARE_MKX_UINTEGER(KaxSeekPreRoll)
-};
-#endif
-
 DECLARE_MKX_MASTER(KaxTrackTranslate)
 };

@ -339,9 +321,6 @@ DECLARE_MKX_UINTEGER(KaxVideoFlagInterlaced)
 DECLARE_MKX_UINTEGER(KaxVideoStereoMode)
 };

-DECLARE_MKX_UINTEGER(KaxVideoAlphaMode)
-};
-
 DECLARE_MKX_UINTEGER(KaxOldStereoMode)
 public:
 	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
@ -522,14 +501,6 @@ DECLARE_MKX_UINTEGER(KaxCueTrack)
 DECLARE_MKX_UINTEGER(KaxCueClusterPosition)
 };

-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_UINTEGER(KaxCueRelativePosition)
-};
-
-DECLARE_MKX_UINTEGER(KaxCueDuration)
-};
-#endif
-
 DECLARE_MKX_UINTEGER(KaxCueBlockNumber)
 };

@ -619,11 +590,6 @@ DECLARE_MKX_MASTER(KaxChapterAtom)
 DECLARE_MKX_UINTEGER(KaxChapterUID)
 };

-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_UNISTRING(KaxChapterStringUID)
-};
-#endif
-
 DECLARE_MKX_UINTEGER(KaxChapterTimeStart)
 };

--- a/matroska/KaxTag.h
+++ b/matroska/KaxTag.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxTags.h
+++ b/matroska/KaxTags.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxTrackAudio.h
+++ b/matroska/KaxTrackAudio.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxTrackEntryData.h
+++ b/matroska/KaxTrackEntryData.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxTrackVideo.h
+++ b/matroska/KaxTrackVideo.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxTracks.h
+++ b/matroska/KaxTracks.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxTypes.h
+++ b/matroska/KaxTypes.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/matroska/KaxVersion.h
+++ b/matroska/KaxVersion.h
@ -17,9 +17,9 @@
 **
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -40,7 +40,7 @@

 START_LIBMATROSKA_NAMESPACE

-#define LIBMATROSKA_VERSION 0x010404
+#define LIBMATROSKA_VERSION 0x010300

 extern const std::string KaxCodeVersion;
 extern const std::string KaxCodeDate;
--- a/matroska/c/libmatroska.h
+++ b/matroska/c/libmatroska.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
--- a/matroska/c/libmatroska_t.h
+++ b/matroska/c/libmatroska_t.h
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/src/FileKax.cpp
+++ b/src/FileKax.cpp
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -72,10 +72,10 @@ FileMatroska::FileMatroska(IOCallback & output)

 FileMatroska::~FileMatroska()
 {
-  //  if (myCurrCluster != NULL)
-  //    throw 0; // there are some data left to write
-  //  if (myCurrReadCluster != NULL || myCurrReadBlock != NULL)
-  //    throw 0; // there are some data left to write
+//    if (myCurrCluster != NULL)
+//	throw 0; // there are some data left to write
+//    if (myCurrReadCluster != NULL || myCurrReadBlock != NULL)
+//	throw 0; // there are some data left to write
 }

 #ifdef OLD
@ -98,7 +98,8 @@ void FileMatroska::Close(const uint32 aTimeLength)

    // get the Track-entry size
    uint32 track_entries_size = 0;
-  for (size_t i=0; i<myTracks.size(); i++) {
+    for (size_t i=0; i<myTracks.size(); i++)
+    {
 	track_entries_size += myTracks[i]->default_size();
    }

@ -106,7 +107,8 @@ void FileMatroska::Close(const uint32 aTimeLength)
    myStreamInfo.TimeLength = aTimeLength;
    myMainHeader.Render(myFile, myStreamInfo);

-  for (i=0; i<myTracks.size(); i++) {
+    for (i=0; i<myTracks.size(); i++)
+    {
 	delete myTracks[i];
    }
 }
@ -118,7 +120,8 @@ filepos_t FileMatroska::RenderHead(const std::string & aEncoderApp)
 {
    try {
 	uint32 track_entries_size = 0;
-    for (size_t i=0; i<myTracks.size(); i++) {
+	for (size_t i=0; i<myTracks.size(); i++)
+	{
 	    track_entries_size += myTracks[i]->default_size();
 	}

@ -134,7 +137,8 @@ filepos_t FileMatroska::RenderHead(const std::string & aEncoderApp)

 	myStreamInfo.CodecEntryPosition = myStreamInfo.MainHeaderSize + myStreamInfo.TrackEntriesSize;
 	myStreamInfo.CodecEntrySize = 4;
-    for (i=0; i<myTracks.size(); i++) {
+	for (i=0; i<myTracks.size(); i++)
+	{
 	    myStreamInfo.CodecEntrySize += myTracks[i]->CodecSize();
 	}

@ -142,7 +146,8 @@ filepos_t FileMatroska::RenderHead(const std::string & aEncoderApp)
 	filepos_t result = myMainHeader.Render(myFile, myStreamInfo);

 	// Track Entries
-    for (i=0; i<myTracks.size(); i++) {
+	for (i=0; i<myTracks.size(); i++)
+	{
 	    myTracks[i]->RenderEntry(myFile, i+1);
 	}
 	myStreamInfo.ClusterPosition = myStreamInfo.CodecEntryPosition + myStreamInfo.CodecEntrySize;
@ -152,7 +157,8 @@ filepos_t FileMatroska::RenderHead(const std::string & aEncoderApp)

 	return result;
    }
-  catch (exception & Ex) {
+    catch (exception & Ex)
+    {
 	throw Ex;
    }
 }
@ -166,25 +172,29 @@ Track * FileMatroska::CreateTrack(const track_type aType)
    return myTracks.back();
 }

-/*Track *FileMatroska::findTrack(Track * aTrack) const {
-  for (size_t i=0; i<myTracks.size(); i++) {
+/*Track *FileMatroska::findTrack(Track * aTrack) const
+{
+    for (size_t i=0; i<myTracks.size(); i++)
+    {
 	if (myTracks[i] == aTrack)
 	    return myTracks[i];
    }

    return NULL;
-  }*/
+}*/

 void FileMatroska::track_SetName(Track * aTrack, const std::string & aName)
 {
-  if (IsMyTrack(aTrack)) {
+    if (IsMyTrack(aTrack))
+    {
        aTrack->SetName(aName);
    }
 }

 void FileMatroska::track_SetLaced(Track * aTrack, bool bLaced)
 {
-  if (IsMyTrack(aTrack)) {
+    if (IsMyTrack(aTrack))
+    {
        aTrack->SetLaced(bLaced);
    }
 }
@ -194,11 +204,14 @@ bool FileMatroska::AddFrame(Track * aTrack, const uint32 aTimecode, const binary
 {
    try {
 	// make sure we know that track
-    if (IsMyTrack(aTrack)) {
+	if (IsMyTrack(aTrack))
+	{
 	    // pass the cluster to the track
 	    // handle the creation of a new cluster if needed
-      if (aTrack->AddFrame(aTimecode, aFrame, aFrameSize, aKeyFrame, aBFrame)) {
-        while (!aTrack->SerialiseBlock(myCurrWriteCluster)) {
+	    if (aTrack->AddFrame(aTimecode, aFrame, aFrameSize, aKeyFrame, aBFrame))
+	    {
+		while (!aTrack->SerialiseBlock(myCurrWriteCluster))
+		{
 		    /// \todo handle errors
 		    uint32 aNbBlock;
 		    myStreamInfo.ClusterSize += myCurrWriteCluster.Render(myFile, aNbBlock);
@ -210,7 +223,8 @@ bool FileMatroska::AddFrame(Track * aTrack, const uint32 aTimecode, const binary
 	}
 	return false;
    }
-  catch (exception & Ex) {
+    catch (exception & Ex)
+    {
 	throw Ex;
    }
 }
@ -229,7 +243,8 @@ uint32 FileMatroska::ReadHead()

 	return result;
    }
-  catch (exception & Ex) {
+    catch (exception & Ex)
+    {
 	throw Ex;
    }
 }
@ -255,7 +270,8 @@ uint32 FileMatroska::ReadTracks()

 	return result;
    }
-  catch (exception & Ex) {
+    catch (exception & Ex)
+    {
 	throw Ex;
    }
 }
@ -270,7 +286,8 @@ uint32 FileMatroska::ReadCodec()

 	return result;
    }
-  catch (exception & Ex) {
+    catch (exception & Ex)
+    {
 	throw Ex;
    }
 }
@ -280,7 +297,8 @@ inline bool FileMatroska::IsMyTrack(const Track * aTrack) const
    if (aTrack == 0)
 	throw 0;

-  for (std::vector<Track*>::const_iterator i = myTracks.begin(); i != myTracks.end(); ++i) {
+    for (std::vector<Track*>::const_iterator i = myTracks.begin(); i != myTracks.end(); i ++)
+    {
 	if (*i == aTrack)
 	    break;
    }
@ -293,10 +311,13 @@ inline bool FileMatroska::IsMyTrack(const Track * aTrack) const

 void FileMatroska::SelectReadingTrack(Track * aTrack, bool select)
 {
-  if (IsMyTrack(aTrack)) {
+    if (IsMyTrack(aTrack))
+    {
 	// here we have the right track
 	// check if it's not already selected
-    for (std::vector<uint8>::iterator j = mySelectedTracks.begin(); j != mySelectedTracks.end(); ++j) {
+	for (std::vector<uint8>::iterator j = mySelectedTracks.begin();
+	    j != mySelectedTracks.end(); j ++)
+	{
 	    if (*j == aTrack->TrackNumber())
 		break;
 	}
@ -314,7 +335,8 @@ inline bool FileMatroska::IsReadingTrack(const uint8 aTrackNumber) const
 {
    for (std::vector<uint8>::const_iterator trackIdx = mySelectedTracks.begin();
         trackIdx != mySelectedTracks.end() && *trackIdx < aTrackNumber;
-       ++trackIdx) {}
+	 trackIdx++)
+    {}

    if (trackIdx == mySelectedTracks.end())
 	return false;
@ -326,7 +348,8 @@ inline bool FileMatroska::IsReadingTrack(const uint8 aTrackNumber) const

 void FileMatroska::Track_GetInfo(const Track * aTrack, TrackInfo & aTrackInfo) const
 {
-  if (IsMyTrack(aTrack)) {
+    if (IsMyTrack(aTrack))
+    {
 	aTrack->GetInfo(aTrackInfo);
    }
 }
@ -335,14 +358,16 @@ void FileMatroska::Track_GetInfo(const Track * aTrack, TrackInfo & aTrackInfo) c

 void FileMatroska::Track_GetInfo_Audio(const Track * aTrack, TrackInfoAudio & aTrackInfo) const
 {
-  if (IsMyTrack(aTrack)) {
+    if (IsMyTrack(aTrack))
+    {
 	aTrack->GetInfoAudio(aTrackInfo);
    }
 }

 void FileMatroska::Track_SetInfo_Audio(Track * aTrack, const TrackInfoAudio & aTrackInfo)
 {
-  if (IsMyTrack(aTrack)) {
+    if (IsMyTrack(aTrack))
+    {
 	aTrack->SetInfoAudio(aTrackInfo);
    }
 }
@ -351,14 +376,16 @@ void FileMatroska::Track_SetInfo_Audio(Track * aTrack, const TrackInfoAudio & aT

 void FileMatroska::Track_GetInfo_Video(const Track * aTrack, TrackInfoVideo & aTrackInfo) const
 {
-  if (IsMyTrack(aTrack)) {
+    if (IsMyTrack(aTrack))
+    {
 	aTrack->GetInfoVideo(aTrackInfo);
    }
 }

 void FileMatroska::Track_SetInfo_Video(Track * aTrack, const TrackInfoVideo & aTrackInfo)
 {
-  if (IsMyTrack(aTrack)) {
+    if (IsMyTrack(aTrack))
+    {
 	aTrack->SetInfoVideo(aTrackInfo);
    }
 }
@ -369,20 +396,24 @@ void FileMatroska::Track_SetInfo_Video(Track * aTrack, const TrackInfoVideo & aT
 bool FileMatroska::ReadFrame(Track * & aTrack, uint32 & aTimecode, const binary * & aFrame, uint32 & aFrameSize,
 						bool & aKeyFrame, bool & aBFrame)
 {
-  if (myCurrReadBlockTrack == 0) {
+    if (myCurrReadBlockTrack == 0)
+    {
 	do {
-      if (myReadBlockNumber >= myStreamInfo.NumberBlock) {
-        //    myReadBlockNumber = myStreamInfo.NumberBlock;
+	    if (myReadBlockNumber >= myStreamInfo.NumberBlock)
+	    {
+//		myReadBlockNumber = myStreamInfo.NumberBlock;
 		return false;
 	    }

 	    // get the next frame in the file
-      if (!myCurrReadCluster.BlockLeft()) {
+	    if (!myCurrReadCluster.BlockLeft())
+	    {
 		myCurrReadCluster.Flush();
 		try {
 		    myCurrReadCluster.FindHead(myFile);
 		}
-        catch (exception & Ex) {
+		catch (exception & Ex)
+		{
 		    return false;
 		}
 	    }
@ -395,7 +426,9 @@ bool FileMatroska::ReadFrame(Track * & aTrack, uint32 & aTimecode, const binary
 	aTrack = myTracks[myCurrReadBlockTrack-1];
 	// get the next frame from the current block
 	aTrack->HandleBlock(myCurrReadBlock, myCurrReadBlockSize);
-  } else {
+    }
+    else
+    {
 	// get the track associated (normally from myTracks)
 	aTrack = myTracks[myCurrReadBlockTrack-1];
    }
@ -405,7 +438,8 @@ bool FileMatroska::ReadFrame(Track * & aTrack, uint32 & aTimecode, const binary
    aFrame = myReadFrame->buf();
    aFrameSize = myReadFrame->length();

-  if (aTrack->NoFrameLeft()) {
+    if (aTrack->NoFrameLeft())
+    {
 	aTrack->FlushBlock();
 	myCurrReadBlockTrack = 0;
    }
--- a/src/KaxAttached.cpp
+++ b/src/KaxAttached.cpp
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/src/KaxAttachments.cpp
+++ b/src/KaxAttachments.cpp
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/src/KaxBlock.cpp
+++ b/src/KaxBlock.cpp
@ -17,9 +17,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -30,14 +30,11 @@
 	\version \$Id: KaxBlock.cpp 1265 2007-01-14 17:20:35Z mosu $
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author Julien Coloos    <suiryc @ users.sf.net>
-  \author Moritz Bunkus <moritz@bunkus.org>
 */
 #include <cassert>

 //#include <streams.h>

-#include "ebml/MemReadIOCallback.h"
-#include "ebml/SafeReadIOCallback.h"
 #include "matroska/KaxBlock.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxBlockData.h"
@ -87,16 +84,17 @@ KaxInternalBlock::KaxInternalBlock(const KaxInternalBlock & ElementToClone)
 	// add a clone of the list
 	std::vector<DataBuffer *>::const_iterator Itr = ElementToClone.myBuffers.begin();
 	std::vector<DataBuffer *>::iterator myItr = myBuffers.begin();
-  while (Itr != ElementToClone.myBuffers.end()) {
+	while (Itr != ElementToClone.myBuffers.end())
+	{
 		*myItr = (*Itr)->Clone();
-    ++Itr; ++myItr;
+		Itr++; myItr++;
 	}
 }


 KaxBlockGroup::~KaxBlockGroup()
 {
-  //NOTE("KaxBlockGroup::~KaxBlockGroup");
+//NOTE("KaxBlockGroup::~KaxBlockGroup");
 }

 KaxBlockGroup::KaxBlockGroup(EBML_EXTRA_DEF)
@ -163,7 +161,7 @@ LacingType KaxInternalBlock::GetBestLacingType() const {
 		return LACING_EBML;
 }

-filepos_t KaxInternalBlock::UpdateSize(bool /* bSaveDefault */, bool /* bForceRender */)
+filepos_t KaxInternalBlock::UpdateSize(bool bSaveDefault, bool bForceRender)
 {
 	LacingType LacingHere;
    assert(EbmlBinary::GetBuffer() == NULL); // Data is not used for KaxInternalBlock
@ -184,7 +182,8 @@ filepos_t KaxInternalBlock::UpdateSize(bool /* bSaveDefault */, bool /* bForceRe
 				LacingHere = GetBestLacingType();
 			else
 				LacingHere = mLacing;
-      switch (LacingHere) {
+			switch (LacingHere)
+			{
 			case LACING_XIPH:
 				for (i=0; i<myBuffers.size()-1; i++) {
 					SetSize_(GetSize() + myBuffers[i]->Size() + (myBuffers[i]->Size() / 0xFF + 1));
@ -202,7 +201,6 @@ filepos_t KaxInternalBlock::UpdateSize(bool /* bSaveDefault */, bool /* bForceRe
 				}
 				break;
 			default:
-          i = 0;
 				assert(0);
 			}
 			// Size of the last frame (not in lace)
@ -228,7 +226,7 @@ KaxBlockVirtual::KaxBlockVirtual(const KaxBlockVirtual & ElementToClone)
 }

 KaxBlockVirtual::KaxBlockVirtual(EBML_EXTRA_DEF)
-  :EBML_DEF_BINARY(KaxBlockVirtual)EBML_DEF_SEP ParentCluster(NULL)
+:EBML_DEF_BINARY(KaxBlockVirtual)EBML_DEF_SEP ParentCluster(NULL)
 {
    SetBuffer(DataBlock,sizeof(DataBlock));
    SetValueIsSet(false);
@ -240,7 +238,7 @@ KaxBlockVirtual::~KaxBlockVirtual()
        SetBuffer( NULL, 0 ); 
 }

-filepos_t KaxBlockVirtual::UpdateSize(bool /* bSaveDefault */, bool /* bForceRender */)
+filepos_t KaxBlockVirtual::UpdateSize(bool bSaveDefault, bool bForceRender)
 {
 	assert(TrackNumber < 0x4000);
 	binary *cursor = EbmlBinary::GetBuffer();
@ -270,7 +268,7 @@ filepos_t KaxBlockVirtual::UpdateSize(bool /* bSaveDefault */, bool /* bForceRen
 	\todo more optimisation is possible (render the Block head and don't copy the buffer in memory, care should be taken with the allocation of Data)
 	\todo the actual timecode to write should be retrieved from the Cluster from here
 */
-filepos_t KaxInternalBlock::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bSaveDefault */)
+filepos_t KaxInternalBlock::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault)
 {
 	if (myBuffers.size() == 0) {
 		return 0;
@ -322,7 +320,8 @@ filepos_t KaxInternalBlock::RenderData(IOCallback & output, bool /* bForceRender
 		}
 		
 		// lacing flag
-    switch (mLacing) {
+		switch (mLacing)
+		{
 		case LACING_XIPH:
 			*cursor++ |= 0x02;
 			break;
@ -341,7 +340,8 @@ filepos_t KaxInternalBlock::RenderData(IOCallback & output, bool /* bForceRender
 		output.writeFully(BlockHead, 4 + ((TrackNumber > 0x80) ? 1 : 0));

 		binary tmpValue;
-    switch (mLacing) {
+		switch (mLacing)
+		{
 		case LACING_XIPH:
 			// number of laces
 			tmpValue = myBuffers.size()-1;
@ -365,6 +365,7 @@ filepos_t KaxInternalBlock::RenderData(IOCallback & output, bool /* bForceRender
 			// number of laces
 			tmpValue = myBuffers.size()-1;
 			output.writeFully(&tmpValue, 1);
+
 			{
 				int64 _Size;
 				int _CodedSize;
@ -452,56 +453,51 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)

 	FirstFrameLocation = input.getFilePointer(); // will be updated accordingly below

-  SetValueIsSet(false);
-
-  try {
-    if (ReadFully == SCOPE_ALL_DATA) {
+	if (ReadFully == SCOPE_ALL_DATA)
+	{
 		Result = EbmlBinary::ReadData(input, ReadFully);
-      if (Result != GetSize())
-        throw SafeReadIOCallback::EndOfStreamX(GetSize() - Result);
-
-      binary *BufferStart = EbmlBinary::GetBuffer();
-
-      SafeReadIOCallback Mem(*this);
+        binary *cursor = EbmlBinary::GetBuffer();
 		uint8 BlockHeadSize = 4;

 		// update internal values
-      TrackNumber = Mem.GetUInt8();
+		TrackNumber = *cursor++;
 		if ((TrackNumber & 0x80) == 0) {
 			// there is extra data
 			if ((TrackNumber & 0x40) == 0) {
 				// We don't support track numbers that large !
-          throw SafeReadIOCallback::EndOfStreamX(0);
+				return Result;
 			}
 			TrackNumber = (TrackNumber & 0x3F) << 8;
-        TrackNumber += Mem.GetUInt8();
+			TrackNumber += *cursor++;
 			BlockHeadSize++;
 		} else {
 			TrackNumber &= 0x7F;
 		}

-      LocalTimecode = int16(Mem.GetUInt16BE());
+		big_int16 b16;
+		b16.Eval(cursor);
+		LocalTimecode = int16(b16);
 		bLocalTimecodeUsed = true;
+		cursor += 2;

-      uint8 Flags = Mem.GetUInt8();
 		if (EbmlId(*this) == EBML_ID(KaxSimpleBlock)) {
-        bIsKeyframe = (Flags & 0x80) != 0;
-        bIsDiscardable = (Flags & 0x01) != 0;
+			bIsKeyframe = (*cursor & 0x80) != 0;
+			bIsDiscardable = (*cursor & 0x01) != 0;
 		}
-      mInvisible = (Flags & 0x08) >> 3;
-      mLacing = LacingType((Flags & 0x06) >> 1);
+		mInvisible = (*cursor & 0x08) >> 3;
+		mLacing = LacingType((*cursor++ & 0x06) >> 1);

 		// put all Frames in the list
 		if (mLacing == LACING_NONE) {
-        FirstFrameLocation += Mem.GetPosition();
-        DataBuffer * soloFrame = new DataBuffer(BufferStart + Mem.GetPosition(), GetSize() - BlockHeadSize);
+			FirstFrameLocation += cursor - EbmlBinary::GetBuffer();
+			DataBuffer * soloFrame = new DataBuffer(cursor, GetSize() - BlockHeadSize);
 			myBuffers.push_back(soloFrame);
 			SizeList.resize(1);
 			SizeList[0] = GetSize() - BlockHeadSize;
 		} else {
 			// read the number of frames in the lace
 			uint32 LastBufferSize = GetSize() - BlockHeadSize - 1; // 1 for number of frame
-        uint8 FrameNum = Mem.GetUInt8(); // number of frames in the lace - 1
+			uint8 FrameNum = *cursor++; // number of frames in the lace - 1
 			// read the list of frame sizes
 			uint8 Index;
 			int32 FrameSize;
@ -510,17 +506,16 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)

 			SizeList.resize(FrameNum + 1);

-        switch (mLacing) {
+			switch (mLacing)
+			{
 			case LACING_XIPH:
 				for (Index=0; Index<FrameNum; Index++) {
 					// get the size of the frame
 					FrameSize = 0;
-              uint8 Value;
 					do {
-                Value = Mem.GetUInt8();
-                FrameSize += Value;
+						FrameSize += uint8(*cursor);
 						LastBufferSize--;
-              } while (Value == 0xFF);
+					} while (*cursor++ == 0xFF);
 					SizeList[Index] = FrameSize;
 					LastBufferSize -= FrameSize;
 				}
@ -528,24 +523,19 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
 				break;
 			case LACING_EBML:
 				SizeRead = LastBufferSize;
-            FrameSize = ReadCodedSizeValue(BufferStart + Mem.GetPosition(), SizeRead, SizeUnknown);
-            if (!FrameSize || (static_cast<uint32>(FrameSize + SizeRead) > LastBufferSize))
-              throw SafeReadIOCallback::EndOfStreamX(SizeRead);
+				FrameSize = ReadCodedSizeValue(cursor, SizeRead, SizeUnknown);
 				SizeList[0] = FrameSize;
-            Mem.Skip(SizeRead);
+				cursor += SizeRead;
 				LastBufferSize -= FrameSize + SizeRead;

 				for (Index=1; Index<FrameNum; Index++) {
 					// get the size of the frame
 					SizeRead = LastBufferSize;
-              FrameSize += ReadCodedSizeSignedValue(BufferStart + Mem.GetPosition(), SizeRead, SizeUnknown);
-              if (!FrameSize || (static_cast<uint32>(FrameSize + SizeRead) > LastBufferSize))
-                throw SafeReadIOCallback::EndOfStreamX(SizeRead);
+					FrameSize += ReadCodedSizeSignedValue(cursor, SizeRead, SizeUnknown);
 					SizeList[Index] = FrameSize;
-              Mem.Skip(SizeRead);
+					cursor += SizeRead;
 					LastBufferSize -= FrameSize + SizeRead;
 				}
-            if (Index <= FrameNum) // Safety check if FrameNum == 0
 				SizeList[Index] = LastBufferSize;
 				break;
 			case LACING_FIXED:
@ -558,34 +548,20 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
 				assert(0);
 			}

-        FirstFrameLocation += Mem.GetPosition();
+			FirstFrameLocation += cursor - EbmlBinary::GetBuffer();

 			for (Index=0; Index<=FrameNum; Index++) {
-          DataBuffer * lacedFrame = new DataBuffer(BufferStart + Mem.GetPosition(), SizeList[Index]);
+				DataBuffer * lacedFrame = new DataBuffer(cursor, SizeList[Index]);
 				myBuffers.push_back(lacedFrame);
-          Mem.Skip(SizeList[Index]);
+				cursor += SizeList[Index];
 			}
 		}
-
-      binary *BufferEnd = BufferStart + GetSize();
-      size_t NumFrames  = myBuffers.size();
-
-      // Sanity checks for frame pointers and boundaries.
-      for (size_t Index = 0; Index < NumFrames; ++Index) {
-        binary *FrameStart  = myBuffers[Index]->Buffer();
-        binary *FrameEnd    = FrameStart + myBuffers[Index]->Size();
-        binary *ExpectedEnd = (Index + 1) < NumFrames ? myBuffers[Index + 1]->Buffer() : BufferEnd;
-
-        if ((FrameStart < BufferStart) || (FrameEnd > BufferEnd) || (FrameEnd != ExpectedEnd))
-          throw SafeReadIOCallback::EndOfStreamX(0);
-      }
-
 		SetValueIsSet();
-    } else if (ReadFully == SCOPE_PARTIAL_DATA) {
+	}
+	else if (ReadFully == SCOPE_PARTIAL_DATA)
+	{
 		binary _TempHead[5];
 		Result = input.read(_TempHead, 5);
-      if (Result != 5)
-        throw SafeReadIOCallback::EndOfStreamX(0);
 		binary *cursor = _TempHead;
 		binary *_tmpBuf;
 		uint8 BlockHeadSize = 4;
@ -617,7 +593,8 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
 		}
 		mInvisible = (*cursor & 0x08) >> 3;
 		mLacing = LacingType((*cursor++ & 0x06) >> 1);
-      if (cursor == &_TempHead[4]) {
+		if (cursor == &_TempHead[4])
+		{
 			_TempHead[0] = _TempHead[4];
 		} else {
 			Result += input.read(_TempHead, 1);
@ -638,7 +615,8 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)

 			SizeList.resize(FrameNum + 1);

-        switch (mLacing) {
+			switch (mLacing)
+			{
 			case LACING_XIPH:
 				for (Index=0; Index<FrameNum; Index++) {
 					// get the size of the frame
@ -700,21 +678,6 @@ filepos_t KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
 		Result = GetSize();
 	}

-  } catch (SafeReadIOCallback::EndOfStreamX &) {
-    SetValueIsSet(false);
-
-    std::memset(EbmlBinary::GetBuffer(), 0, GetSize());
-    myBuffers.clear();
-    SizeList.clear();
-    Timecode           = 0;
-    LocalTimecode      = 0;
-    TrackNumber        = 0;
-    bLocalTimecodeUsed = false;
-    FirstFrameLocation = 0;
-
-    return 0;
-  }
-
 	return Result;
 }

@ -729,7 +692,7 @@ bool KaxBlockGroup::AddFrame(const KaxTrackEntry & track, uint64 timecode, DataB

 bool KaxBlockGroup::AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, const KaxBlockGroup & PastBlock, LacingType lacing)
 {
-  //  assert(past_timecode < 0);
+//	assert(past_timecode < 0);

 	KaxBlock & theBlock = GetChild<KaxBlock>(*this);
 	assert(ParentCluster != NULL);
@ -746,9 +709,9 @@ bool KaxBlockGroup::AddFrame(const KaxTrackEntry & track, uint64 timecode, DataB

 bool KaxBlockGroup::AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, const KaxBlockGroup & PastBlock, const KaxBlockGroup & ForwBlock, LacingType lacing)
 {
-  //  assert(past_timecode < 0);
+//	assert(past_timecode < 0);

-  //  assert(forw_timecode > 0);
+//	assert(forw_timecode > 0);
 	
 	KaxBlock & theBlock = GetChild<KaxBlock>(*this);
 	assert(ParentCluster != NULL);
@ -775,13 +738,15 @@ bool KaxBlockGroup::AddFrame(const KaxTrackEntry & track, uint64 timecode, DataB
 	ParentTrack = &track;
 	bool bRes = theBlock.AddFrame(track, timecode, buffer, lacing);

-  if (PastBlock != NULL) {
+	if (PastBlock != NULL)
+	{
 		KaxReferenceBlock & thePastRef = GetChild<KaxReferenceBlock>(*this);
 		thePastRef.SetReferencedBlock(PastBlock);
 		thePastRef.SetParentBlock(*this);
 	}

-  if (ForwBlock != NULL) {
+	if (ForwBlock != NULL)
+	{
 		KaxReferenceBlock & theFutureRef = AddNewChild<KaxReferenceBlock>(*this);
 		theFutureRef.SetReferencedBlock(ForwBlock);
 		theFutureRef.SetParentBlock(*this);
@ -825,7 +790,8 @@ unsigned int KaxBlockGroup::ReferenceCount() const
 	KaxReferenceBlock * MyBlockAdds = static_cast<KaxReferenceBlock *>(FindFirstElt(EBML_INFO(KaxReferenceBlock)));
 	if (MyBlockAdds != NULL) {
 		Result++;
-    while ((MyBlockAdds = static_cast<KaxReferenceBlock *>(FindNextElt(*MyBlockAdds))) != NULL) {
+		while ((MyBlockAdds = static_cast<KaxReferenceBlock *>(FindNextElt(*MyBlockAdds))) != NULL)
+		{
 			Result++;
 		}
 	}
@ -912,11 +878,13 @@ int64 KaxInternalBlock::GetDataPosition(size_t FrameNumber)
 {
 	int64 _Result = -1;

-  if (ValueIsSet() && FrameNumber < SizeList.size()) {
+	if (ValueIsSet() && FrameNumber < SizeList.size())
+	{
 		_Result = FirstFrameLocation;
 	
 		size_t _Idx = 0;
-    while(FrameNumber--) {
+		while(FrameNumber--)
+		{
 			_Result += SizeList[_Idx++];
 		}
 	}
@ -928,7 +896,8 @@ int64 KaxInternalBlock::GetFrameSize(size_t FrameNumber)
 {
 	int64 _Result = -1;

-  if (/*bValueIsSet &&*/ FrameNumber < SizeList.size()) {
+	if (/*bValueIsSet &&*/ FrameNumber < SizeList.size())
+	{
 		_Result = SizeList[FrameNumber];
 	}

@ -1006,8 +975,11 @@ bool KaxBlockBlob::AddFrameAuto(const KaxTrackEntry & track, uint64 timecode, Da
 	}
 	else
 #endif
-    if (ReplaceSimpleByGroup())
+	{
+		if (ReplaceSimpleByGroup()) {
 			bResult = Block.group->AddFrame(track, timecode, buffer, PastBlock, ForwBlock, lacing);
+		}
+	}

 	return bResult;
 }
@ -1034,7 +1006,8 @@ bool KaxBlockBlob::ReplaceSimpleByGroup()
 		}
 	}
 #if MATROSKA_VERSION >= 2
-  else {
+	else 
+	{

 		if (Block.simpleblock != NULL) {
 			KaxSimpleBlock *old_simpleblock = Block.simpleblock;
@ -1061,7 +1034,7 @@ void KaxBlockBlob::SetBlockGroup( KaxBlockGroup &BlockRef )
 	Block.group = &BlockRef;
 }

-filepos_t KaxBlockVirtual::ReadData(IOCallback & input, ScopeMode /* ReadFully */)
+filepos_t KaxBlockVirtual::ReadData(IOCallback & input, ScopeMode ReadFully)
 {
    input.setFilePointer(SizePosition + CodedSizeLength(Size, SizeLength, bSizeIsFinite) + Size, seek_beginning);
    return GetSize();
--- a/src/KaxBlockData.cpp
+++ b/src/KaxBlockData.cpp
@ -17,9 +17,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -49,21 +49,21 @@ const KaxBlockBlob & KaxReferenceBlock::RefBlock() const
 }

 KaxReferenceBlock::KaxReferenceBlock(EBML_EXTRA_DEF)
-  :EBML_DEF_SINTEGER(KaxReferenceBlock)EBML_DEF_SEP
-  RefdBlock(NULL)
-  ,ParentBlock(NULL)
-  ,bTimecodeSet(false)
-  ,bOurBlob(false)
+:EBML_DEF_SINTEGER(KaxReferenceBlock)EBML_DEF_SEP
+RefdBlock(NULL)
+,ParentBlock(NULL)
+,bTimecodeSet(false)
+,bOurBlob(false)
 {
    bTimecodeSet = false;
 }

 KaxReferenceBlock::KaxReferenceBlock(const KaxReferenceBlock & ElementToClone)
-  :EbmlSInteger(ElementToClone)
-  ,RefdBlock(NULL)
-  ,ParentBlock(NULL)
-  ,bTimecodeSet(ElementToClone.bTimecodeSet)
-  ,bOurBlob(false)
+:EbmlSInteger(ElementToClone)
+,RefdBlock(NULL)
+,ParentBlock(NULL)
+,bTimecodeSet(ElementToClone.bTimecodeSet)
+,bOurBlob(false)
 {
 }

--- a/src/KaxCluster.cpp
+++ b/src/KaxCluster.cpp
@ -17,9 +17,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -55,7 +55,8 @@ KaxCluster::KaxCluster(const KaxCluster & ElementToClone)
 {
 	// update the parent of each children
 	EBML_MASTER_ITERATOR Itr = begin();
-  while (Itr != end()) {
+	while (Itr != end())
+	{
 		if (EbmlId(**Itr) == EBML_ID(KaxBlockGroup)) {
 			static_cast<KaxBlockGroup   *>(*Itr)->SetParent(*this);
 		} else if (EbmlId(**Itr) == EBML_ID(KaxBlock)) {
@ -97,6 +98,7 @@ bool KaxCluster::AddFrameInternal(const KaxTrackEntry & track, uint64 timecode,
 	if (currentNewBlock == NULL || uint32(track.TrackNumber()) != uint32(currentNewBlock->TrackNumber()) || PastBlock != NULL || ForwBlock != NULL) {
 		KaxBlockGroup & aNewBlock = GetNewBlock();
 		MyNewBlock = currentNewBlock = &aNewBlock;
+		currentNewBlock = &aNewBlock;
 	}

 	if (PastBlock != NULL) {
@ -164,13 +166,17 @@ filepos_t KaxCluster::Render(IOCallback & output, KaxCues & CueToUpdate, bool bS

 		// SilentTracks handling
 		// check the parent cluster for existing tracks and see if they are contained in this cluster or not
-    if (bSilentTracksUsed) {
+		if (bSilentTracksUsed)
+		{
 			KaxTracks & MyTracks = *static_cast<KaxTracks *>(ParentSegment->FindElt(EBML_INFO(KaxTracks)));
-      for (TrkItr = MyTracks.begin(); TrkItr != MyTracks.end(); ++TrkItr) {
-        if (EbmlId(*(*TrkItr)) == EBML_ID(KaxTrackEntry)) {
+	        for (TrkItr = MyTracks.begin(); TrkItr != MyTracks.end(); ++TrkItr)
+            {
+				if (EbmlId(*(*TrkItr)) == EBML_ID(KaxTrackEntry))
+				{
 					KaxTrackEntry & entry = *static_cast<KaxTrackEntry *>(*TrkItr);
 					uint32 tracknum = entry.TrackNumber();
-          for (Itr = begin(); Itr != end(); ++Itr) {
+	                for (Itr = begin(); Itr != end(); ++Itr)
+                    {
 						if (EbmlId(*(*Itr)) == EBML_ID(KaxBlockGroup)) {
 							KaxBlockGroup & group = *static_cast<KaxBlockGroup *>(*Itr);
 							if (group.TrackNumber() == tracknum)
@ -178,7 +184,8 @@ filepos_t KaxCluster::Render(IOCallback & output, KaxCues & CueToUpdate, bool bS
 						}
 					}
 					// the track wasn't found in this cluster
-          if (Itr == end()) {
+					if (Itr == end())
+					{
 						KaxClusterSilentTracks * SilentTracks = static_cast<KaxClusterSilentTracks *>(this->FindFirstElt(EBML_INFO(KaxClusterSilentTracks)));
 						assert(SilentTracks != NULL); // the flag bSilentTracksUsed should be set when creating the Cluster
 						KaxClusterSilentTrackNumber * trackelt = static_cast<KaxClusterSilentTrackNumber *>(SilentTracks->AddNewElt(EBML_INFO(KaxClusterSilentTrackNumber)));
@ -191,14 +198,16 @@ filepos_t KaxCluster::Render(IOCallback & output, KaxCues & CueToUpdate, bool bS
 		Result = EbmlMaster::Render(output, bSaveDefault);
 		// For all Blocks add their position on the CueEntry
 		
-    for (Itr = begin(); Itr != end(); ++Itr) {
+        for (Itr = begin(); Itr != end(); ++Itr)
+        {
 			if (EbmlId(*(*Itr)) == EBML_ID(KaxBlockGroup)) {
 				CueToUpdate.PositionSet(*static_cast<const KaxBlockGroup *>(*Itr));
 			}
 		}
 	} else {
 		// new school, using KaxBlockBlob
-    for (Index = 0; Index<Blobs.size(); Index++) {
+		for (Index = 0; Index<Blobs.size(); Index++)
+		{
 #if MATROSKA_VERSION >= 2
 			if (Blobs[Index]->IsSimpleBlock())
 				PushElement( (KaxSimpleBlock&) *Blobs[Index] );
@ -209,10 +218,13 @@ filepos_t KaxCluster::Render(IOCallback & output, KaxCues & CueToUpdate, bool bS

 		// SilentTracks handling
 		// check the parent cluster for existing tracks and see if they are contained in this cluster or not
-    if (bSilentTracksUsed) {
+		if (bSilentTracksUsed)
+		{
 			KaxTracks & MyTracks = *static_cast<KaxTracks *>(ParentSegment->FindElt(EBML_INFO(KaxTracks)));
-      for (TrkItr = MyTracks.begin(); TrkItr != MyTracks.end(); ++TrkItr) {
-        if (EbmlId(*(*TrkItr)) == EBML_ID(KaxTrackEntry)) {
+	        for (TrkItr = MyTracks.begin(); TrkItr != MyTracks.end(); ++TrkItr)
+            {
+				if (EbmlId(*(*TrkItr)) == EBML_ID(KaxTrackEntry))
+				{
 					KaxTrackEntry & entry = *static_cast<KaxTrackEntry *>(*TrkItr);
 					uint32 tracknum = entry.TrackNumber();
 					for (Index = 0; Index<Blobs.size(); Index++) {
@ -220,7 +232,8 @@ filepos_t KaxCluster::Render(IOCallback & output, KaxCues & CueToUpdate, bool bS
 								break; // this track is used
 					}
 					// the track wasn't found in this cluster
-          if (Index == ListSize()) {
+					if (Index == ListSize())
+					{
 						KaxClusterSilentTracks * SilentTracks = static_cast<KaxClusterSilentTracks *>(this->FindFirstElt(EBML_INFO(KaxClusterSilentTracks)));
 						assert(SilentTracks != NULL); // the flag bSilentTracksUsed should be set when creating the Cluster
 						KaxClusterSilentTrackNumber * trackelt = static_cast<KaxClusterSilentTrackNumber *>(SilentTracks->AddNewElt(EBML_INFO(KaxClusterSilentTrackNumber)));
@ -290,7 +303,8 @@ KaxBlockGroup & KaxCluster::GetNewBlock()
 void KaxCluster::ReleaseFrames()
 {
    EBML_MASTER_ITERATOR Itr;
-  for (Itr = begin(); Itr != end(); ++Itr) {
+    for (Itr = begin(); Itr != end(); ++Itr)
+    {
 		if (EbmlId(*(*Itr)) == EBML_ID(KaxBlockGroup)) {
 			static_cast<KaxBlockGroup*>(*Itr)->ReleaseFrames();
 		}
--- a/src/KaxContexts.cpp
+++ b/src/KaxContexts.cpp
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/src/KaxCues.cpp
+++ b/src/KaxCues.cpp
@ -17,9 +17,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -55,7 +55,8 @@ bool KaxCues::AddBlockGroup(const KaxBlockGroup & BlockRef)
 	BlockReference->SetBlockGroup(*const_cast<KaxBlockGroup*>(&BlockRef));

 	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ListIdx++)
-    if (&(KaxBlockGroup&)*ListIdx == &BlockRef) {
+		if (&(KaxBlockGroup&)*ListIdx == &BlockRef)
+        {
            delete BlockReference;
 			return true;
        }
@ -69,7 +70,7 @@ bool KaxCues::AddBlockBlob(const KaxBlockBlob & BlockReference)
 	// Do not add the element if it's already present.
 	std::vector<const KaxBlockBlob *>::iterator ListIdx;

-  for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx)
+	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ListIdx++)
 		if (*ListIdx == &BlockReference)
 			return true;

@ -82,7 +83,7 @@ void KaxCues::PositionSet(const KaxBlockBlob & BlockReference)
 	// look for the element in the temporary references
 	std::vector<const KaxBlockBlob *>::iterator ListIdx;

-  for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx) {
+	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ListIdx++) {
 		if (*ListIdx == &BlockReference) {
 			// found, now add the element to the entry list
 			KaxCuePoint & NewPoint = AddNewChild<KaxCuePoint>(*this);
@ -98,7 +99,7 @@ void KaxCues::PositionSet(const KaxBlockGroup & BlockRef)
 	// look for the element in the temporary references
 	std::vector<const KaxBlockBlob *>::iterator ListIdx;

-  for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx) {
+	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ListIdx++) {
 		const KaxInternalBlock &refTmp = **ListIdx;
 		if (refTmp.GlobalTimecode() == BlockRef.GlobalTimecode() &&
 			refTmp.TrackNum() == BlockRef.TrackNumber()) {
@ -122,12 +123,14 @@ const KaxCuePoint * KaxCues::GetTimecodePoint(uint64 aTimecode) const
 	uint64 aNextTime = EBML_PRETTYLONGINT(0xFFFFFFFFFFFF);

    EBML_MASTER_CONST_ITERATOR Itr;
-  for (Itr = begin(); Itr != end(); ++Itr) {
+	for (Itr = begin(); Itr != end(); ++Itr)
+    {
 		if (EbmlId(*(*Itr)) == EBML_ID(KaxCuePoint)) {
 			const KaxCuePoint *tmp = static_cast<const KaxCuePoint *>(*Itr);
 			// check the tile
 			const KaxCueTime *aTime = static_cast<const KaxCueTime *>(tmp->FindFirstElt(EBML_INFO(KaxCueTime)));
-      if (aTime != NULL) {
+			if (aTime != NULL)
+			{
 				uint64 _Time = uint64(*aTime);
 				if (_Time > aPrevTime && _Time < TimecodeToLocate) {
 					aPrevTime = _Time;
--- a/src/KaxCuesData.cpp
+++ b/src/KaxCuesData.cpp
@ -17,9 +17,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -62,7 +62,8 @@ void KaxCuePoint::PositionSet(const KaxBlockGroup & BlockReference, uint64 Globa

 #if MATROSKA_VERSION >= 2
 	// handle reference use
-  if (BlockReference.ReferenceCount() != 0) {
+	if (BlockReference.ReferenceCount() != 0)
+	{
 		unsigned int i;
 		for (i=0; i<BlockReference.ReferenceCount(); i++) {
 			KaxCueReference & NewRefs = AddNewChild<KaxCueReference>(NewPositions);
@ -97,7 +98,8 @@ void KaxCuePoint::PositionSet(const KaxBlockBlob & BlobReference, uint64 GlobalT

 #if 0 // MATROSKA_VERSION >= 2
 	// handle reference use
-  if (BlockReference.ReferenceCount() != 0) {
+	if (BlockReference.ReferenceCount() != 0)
+	{
 		unsigned int i;
 		for (i=0; i<BlockReference.ReferenceCount(); i++) {
 			KaxCueReference & NewRefs = AddNewChild<KaxCueReference>(NewPositions);
@ -135,7 +137,8 @@ void KaxCueReference::AddReference(const KaxBlockBlob & BlockReference, uint64 G

 #ifdef OLD
 	// handle recursive reference use
-  if (BlockReference.ReferenceCount() != 0) {
+	if (BlockReference.ReferenceCount() != 0)
+	{
 		unsigned int i;
 		for (i=0; i<BlockReference.ReferenceCount(); i++) {
 			AddReference(BlockReference.Reference(i).RefBlock());
@ -203,7 +206,8 @@ const KaxCueTrackPositions * KaxCuePoint::GetSeekPosition() const
 	uint64 aPosition = EBML_PRETTYLONGINT(0xFFFFFFFFFFFFFFF);
 	// find the position of the "earlier" Cluster
 	const KaxCueTrackPositions *aPoss = static_cast<const KaxCueTrackPositions *>(FindFirstElt(EBML_INFO(KaxCueTrackPositions)));
-  while (aPoss != NULL) {
+	while (aPoss != NULL)
+	{
 		const KaxCueClusterPosition *aPos = static_cast<const KaxCueClusterPosition *>(aPoss->FindFirstElt(EBML_INFO(KaxCueClusterPosition)));
 		if (aPos != NULL && uint64(*aPos) < aPosition) {
 			aPosition = uint64(*aPos);
--- a/src/KaxInfoData.cpp
+++ b/src/KaxInfoData.cpp
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -41,18 +41,18 @@
 START_LIBMATROSKA_NAMESPACE

 KaxPrevUID::KaxPrevUID(EBML_EXTRA_DEF)
-  :KaxSegmentUID(EBML_DEF_BINARY_CTX(KaxPrevUID) EBML_DEF_SEP EBML_EXTRA_CALL)
+:KaxSegmentUID(EBML_DEF_BINARY_CTX(KaxPrevUID) EBML_DEF_SEP EBML_EXTRA_CALL)
 {
 }

 KaxNextUID::KaxNextUID(EBML_EXTRA_DEF)
-  :KaxSegmentUID(EBML_DEF_BINARY_CTX(KaxNextUID) EBML_DEF_SEP EBML_EXTRA_CALL)
+:KaxSegmentUID(EBML_DEF_BINARY_CTX(KaxNextUID) EBML_DEF_SEP EBML_EXTRA_CALL)
 {
 }

 #if defined(HAVE_EBML2) || defined(HAS_EBML2)
 KaxSegmentUID::KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_DEF)
-  :EbmlBinary(EBML_DEF_PARAM EBML_DEF_SEP EBML_EXTRA_CALL)
+:EbmlBinary(EBML_DEF_PARAM EBML_DEF_SEP EBML_EXTRA_CALL)
 {
 }
 #endif
--- a/src/KaxSeekHead.cpp
+++ b/src/KaxSeekHead.cpp
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -65,14 +65,17 @@ KaxSeek * KaxSeekHead::FindFirstOf(const EbmlCallbacks & Callbacks) const
 {
 	// parse all the Entries and find the first to match the type
 	KaxSeek * aElt = static_cast<KaxSeek *>(FindFirstElt(EBML_INFO(KaxSeek)));
-  while (aElt != NULL) {
+	while (aElt != NULL)
+	{
 		KaxSeekID * aId = NULL;
        EBML_MASTER_ITERATOR Itr;
-    for (Itr = aElt->begin(); Itr != aElt->end(); ++Itr) {
+		for (Itr = aElt->begin(); Itr != aElt->end(); ++Itr)
+        {
 			if (EbmlId(*(*Itr)) == EBML_ID(KaxSeekID)) {
 				aId = static_cast<KaxSeekID*>(*Itr);
 				EbmlId aEbmlId(aId->GetBuffer(), aId->GetSize());
-        if (aEbmlId == EBML_INFO_ID(Callbacks)) {
+				if (aEbmlId == EBML_INFO_ID(Callbacks))
+				{
 					return aElt;
 				}
 				break;
@ -90,15 +93,19 @@ KaxSeek * KaxSeekHead::FindNextOf(const KaxSeek &aPrev) const
 	KaxSeek *tmp;
 	
 	// look for the previous in the list
-  for (Itr = begin(); Itr != end(); ++Itr) {
+	for (Itr = begin(); Itr != end(); ++Itr)
+    {
 		if (*Itr == static_cast<const EbmlElement*>(&aPrev))
 			break;
 	}

-  if (Itr != end()) {
+	if (Itr != end())
+    {
 		++Itr;
-    for (; Itr != end(); ++Itr) {
-      if (EbmlId(*(*Itr)) == EBML_ID(KaxSeek)) {
+	    for (; Itr != end(); ++Itr)
+        {
+			if (EbmlId(*(*Itr)) == EBML_ID(KaxSeek))
+			{
 				tmp = (KaxSeek *)(*Itr);
 				if (tmp->IsEbmlId(aPrev))
 					return tmp;
--- a/src/KaxSegment.cpp
+++ b/src/KaxSegment.cpp
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -57,7 +57,8 @@ KaxSegment::KaxSegment(const KaxSegment & ElementToClone)
 {
 	// update the parent of each children
 	EBML_MASTER_ITERATOR Itr = begin();
-  while (Itr != end()) {
+	while (Itr != end())
+	{
 		if (EbmlId(**Itr) == EBML_ID(KaxCluster)) {
 			static_cast<KaxCluster *>(*Itr)->SetParent(*this);
 		}
--- a/src/KaxSemantic.cpp
+++ b/src/KaxSemantic.cpp
@ -20,9 +20,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -153,7 +153,6 @@ DEFINE_SEMANTIC_ITEM(false, false, KaxReferenceBlock)
 #if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(false, true, KaxReferenceVirtual) // not supported
 DEFINE_SEMANTIC_ITEM(false, true, KaxCodecState)
-DEFINE_SEMANTIC_ITEM(false, true, KaxDiscardPadding)
 #endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(false, true, KaxSlices)
 #if MATROSKA_VERSION >= 2
@ -187,7 +186,6 @@ DEFINE_MKX_SINTEGER_CONS(KaxReferenceBlock, 0xFB, 1, KaxBlockGroup, "ReferenceBl
 #if MATROSKA_VERSION >= 2
 DEFINE_MKX_SINTEGER(KaxReferenceVirtual, 0xFD, 1, KaxBlockGroup, "ReferenceVirtual");
 DEFINE_MKX_BINARY (KaxCodecState, 0xA4, 1, KaxBlockGroup, "CodecState");
-DEFINE_MKX_SINTEGER(KaxDiscardPadding, 0x75A2, 2, KaxBlockGroup, "DiscardPadding");
 #endif

 DEFINE_START_SEMANTIC(KaxSlices)
@ -244,9 +242,6 @@ DEFINE_SEMANTIC_ITEM(true, true, KaxTrackFlagLacing)
 DEFINE_SEMANTIC_ITEM(true, true, KaxTrackMinCache)
 DEFINE_SEMANTIC_ITEM(false, true, KaxTrackMaxCache)
 DEFINE_SEMANTIC_ITEM(false, true, KaxTrackDefaultDuration)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxTrackDefaultDecodedFieldDuration)
-#endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(true, true, KaxTrackTimecodeScale)
 #if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(false, true, KaxTrackOffset) // not supported
@ -265,10 +260,6 @@ DEFINE_SEMANTIC_ITEM(false, false, KaxCodecDownloadURL) // not supported
 DEFINE_SEMANTIC_ITEM(true, true, KaxCodecDecodeAll)
 #endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(false, false, KaxTrackOverlay)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxCodecDelay)
-DEFINE_SEMANTIC_ITEM(true, true, KaxSeekPreRoll)
-#endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(false, false, KaxTrackTranslate)
 DEFINE_SEMANTIC_ITEM(false, true, KaxTrackVideo)
 DEFINE_SEMANTIC_ITEM(false, true, KaxTrackAudio)
@ -296,9 +287,6 @@ DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagLacing, 0x9C, 1, KaxTrackEntry, "TrackFlagLa
 DEFINE_MKX_UINTEGER_DEF(KaxTrackMinCache, 0x6DE7, 2, KaxTrackEntry, "TrackMinCache", 0);
 DEFINE_MKX_UINTEGER(KaxTrackMaxCache, 0x6DF8, 2, KaxTrackEntry, "TrackMaxCache");
 DEFINE_MKX_UINTEGER(KaxTrackDefaultDuration, 0x23E383, 3, KaxTrackEntry, "TrackDefaultDuration");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER(KaxTrackDefaultDecodedFieldDuration, 0x234E7A, 3, KaxTrackEntry, "TrackDefaultDecodedFieldDuration");
-#endif
 DEFINE_MKX_FLOAT_DEF(KaxTrackTimecodeScale, 0x23314F, 3, KaxTrackEntry, "TrackTimecodeScale", 1);
 #if MATROSKA_VERSION >= 2
 DEFINE_MKX_SINTEGER_DEF(KaxTrackOffset, 0x537F, 2, KaxTrackEntry, "TrackOffset", 0);
@ -317,10 +305,6 @@ DEFINE_MKX_STRING(KaxCodecDownloadURL, 0x26B240, 3, KaxTrackEntry, "CodecDownloa
 DEFINE_MKX_UINTEGER_DEF(KaxCodecDecodeAll, 0xAA, 1, KaxTrackEntry, "CodecDecodeAll", 1);
 #endif
 DEFINE_MKX_UINTEGER(KaxTrackOverlay, 0x6FAB, 2, KaxTrackEntry, "TrackOverlay");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER_DEF(KaxCodecDelay, 0x56AA, 2, KaxTrackEntry, "CodecDelay", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxSeekPreRoll, 0x56BB, 2, KaxTrackEntry, "SeekPreRoll", 0);
-#endif

 DEFINE_START_SEMANTIC(KaxTrackTranslate)
 DEFINE_SEMANTIC_ITEM(false, false, KaxTrackTranslateEditionUID)
@ -337,7 +321,6 @@ DEFINE_START_SEMANTIC(KaxTrackVideo)
 #if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(true, true, KaxVideoFlagInterlaced)
 DEFINE_SEMANTIC_ITEM(false, true, KaxVideoStereoMode)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoAlphaMode)
 DEFINE_SEMANTIC_ITEM(false, true, KaxOldStereoMode) // not supported
 #endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(true, true, KaxVideoPixelWidth)
@ -361,7 +344,6 @@ DEFINE_MKX_MASTER(KaxTrackVideo, 0xE0, 1, KaxTrackEntry, "TrackVideo");
 #if MATROSKA_VERSION >= 2
 DEFINE_MKX_UINTEGER_DEF(KaxVideoFlagInterlaced, 0x9A, 1, KaxTrackVideo, "VideoFlagInterlaced", 0);
 DEFINE_MKX_UINTEGER_DEF(KaxVideoStereoMode, 0x53B8, 2, KaxTrackVideo, "VideoStereoMode", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoAlphaMode, 0x53C0, 2, KaxTrackVideo, "VideoAlphaMode", 0);
 DEFINE_MKX_UINTEGER(KaxOldStereoMode, 0x53B9, 2, KaxTrackVideo, "OldStereoMode");
 #endif
 DEFINE_MKX_UINTEGER(KaxVideoPixelWidth, 0xB0, 1, KaxTrackVideo, "VideoPixelWidth");
@ -497,10 +479,6 @@ DEFINE_MKX_UINTEGER(KaxCueTime, 0xB3, 1, KaxCuePoint, "CueTime");
 DEFINE_START_SEMANTIC(KaxCueTrackPositions)
 DEFINE_SEMANTIC_ITEM(true, true, KaxCueTrack)
 DEFINE_SEMANTIC_ITEM(true, true, KaxCueClusterPosition)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxCueRelativePosition)
-DEFINE_SEMANTIC_ITEM(false, true, KaxCueDuration)
-#endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(false, true, KaxCueBlockNumber)
 #if MATROSKA_VERSION >= 2
 DEFINE_SEMANTIC_ITEM(false, true, KaxCueCodecState)
@ -511,10 +489,6 @@ DEFINE_END_SEMANTIC(KaxCueTrackPositions)
 DEFINE_MKX_MASTER(KaxCueTrackPositions, 0xB7, 1, KaxCuePoint, "CueTrackPositions");
 DEFINE_MKX_UINTEGER(KaxCueTrack, 0xF7, 1, KaxCueTrackPositions, "CueTrack");
 DEFINE_MKX_UINTEGER(KaxCueClusterPosition, 0xF1, 1, KaxCueTrackPositions, "CueClusterPosition");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER(KaxCueRelativePosition, 0xF0, 1, KaxCueTrackPositions, "CueRelativePosition");
-DEFINE_MKX_UINTEGER(KaxCueDuration, 0xB2, 1, KaxCueTrackPositions, "CueDuration");
-#endif
 DEFINE_MKX_UINTEGER_DEF(KaxCueBlockNumber, 0x5378, 2, KaxCueTrackPositions, "CueBlockNumber", 1);
 #if MATROSKA_VERSION >= 2
 DEFINE_MKX_UINTEGER_DEF(KaxCueCodecState, 0xEA, 1, KaxCueTrackPositions, "CueCodecState", 0);
@ -587,9 +561,6 @@ DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagOrdered, 0x45DD, 2, KaxEditionEntry, "Edit
 DEFINE_START_SEMANTIC(KaxChapterAtom)
 DEFINE_SEMANTIC_ITEM(false, false, KaxChapterAtom) // recursive
 DEFINE_SEMANTIC_ITEM(true, true, KaxChapterUID)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxChapterStringUID)
-#endif // MATROSKA_VERSION
 DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTimeStart)
 DEFINE_SEMANTIC_ITEM(false, true, KaxChapterTimeEnd)
 DEFINE_SEMANTIC_ITEM(true, true, KaxChapterFlagHidden)
@ -604,9 +575,6 @@ DEFINE_END_SEMANTIC(KaxChapterAtom)

 DEFINE_MKX_MASTER(KaxChapterAtom, 0xB6, 1, KaxEditionEntry, "ChapterAtom");
 DEFINE_MKX_UINTEGER(KaxChapterUID, 0x73C4, 2, KaxChapterAtom, "ChapterUID");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UNISTRING(KaxChapterStringUID, 0x5654, 2, KaxChapterAtom, "ChapterStringUID");
-#endif
 DEFINE_MKX_UINTEGER(KaxChapterTimeStart, 0x91, 1, KaxChapterAtom, "ChapterTimeStart");
 DEFINE_MKX_UINTEGER(KaxChapterTimeEnd, 0x92, 1, KaxChapterAtom, "ChapterTimeEnd");
 DEFINE_MKX_UINTEGER_DEF(KaxChapterFlagHidden, 0x98, 1, KaxChapterAtom, "ChapterFlagHidden", 0);
@ -698,102 +666,97 @@ DEFINE_MKX_UINTEGER_DEF(KaxTagDefault, 0x4484, 2, KaxTagSimple, "TagDefault", 1)
 DEFINE_MKX_UNISTRING(KaxTagString, 0x4487, 2, KaxTagSimple, "TagString");
 DEFINE_MKX_BINARY (KaxTagBinary, 0x4485, 2, KaxTagSimple, "TagBinary");

-filepos_t KaxBlockVirtual::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxBlockVirtual::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxReferenceVirtual::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxReferenceVirtual::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxSliceFrameNumber::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxSliceFrameNumber::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxSliceBlockAddID::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxSliceBlockAddID::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxSliceDelay::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxSliceDelay::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxSliceDuration::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxSliceDuration::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxEncryptedBlock::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxEncryptedBlock::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxTrackTimecodeScale::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxTrackOffset::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxTrackOffset::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxCodecSettings::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxCodecSettings::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxCodecInfoURL::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxCodecInfoURL::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxCodecDownloadURL::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxCodecDownloadURL::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxOldStereoMode::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxOldStereoMode::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxVideoGamma::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxVideoGamma::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxVideoFrameRate::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxVideoFrameRate::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxAudioPosition::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxAudioPosition::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxCueRefCluster::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxCueRefCluster::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxCueRefNumber::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxCueRefNumber::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxCueRefCodecState::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }

-filepos_t KaxCueRefCodecState::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-  assert(false); // no you are not allowed to use this element !
-  return 0;
-}
-
-filepos_t KaxFileReferral::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
+filepos_t KaxFileReferral::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {
 	assert(false); // no you are not allowed to use this element !
 	return 0;
 }
--- a/src/KaxTracks.cpp
+++ b/src/KaxTracks.cpp
@ -19,9 +19,9 @@
 ** 
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/src/KaxVersion.cpp
+++ b/src/KaxVersion.cpp
@ -19,9 +19,9 @@
 **
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@ -37,11 +37,7 @@

 START_LIBMATROSKA_NAMESPACE

-const std::string KaxCodeVersion = "1.4.4";
-
-// Up to version 1.4.4 this library exported a build date string. As
-// this made the build non-reproducible, replace it by a placeholder to
-// remain binary compatible.
-const std::string KaxCodeDate = "Unknown";
+const std::string KaxCodeVersion = "1.3.0";
+const std::string KaxCodeDate    = __TIMESTAMP__;

 END_LIBMATROSKA_NAMESPACE
--- a/Show More
+++ b/Show More