add support for SeekPreRoll

add DiscardPadding and CodecDelay elements
Merge pull request #1 from RedDwarf69/master
2013-06-15 18:27:49 +02:00 · 2013-06-15 18:22:34 +02:00 · 2013-04-20 02:54:23 -07:00 · 2013-04-20 09:57:44 +01:00 · 2013-04-14 16:34:22 +01:00 · 2013-04-14 16:29:57 +01:00
71 changed files with 2489 additions and 2755 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+*.[ao]
--- a/19
+++ b/19
@@ -1,3 +1,19 @@
+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
+    - The KaxCodeVersion variable now resides in the library instead of being declared static in the header file.
+    - make KaxChapterSegmentEditionUID an unsigned integer to match the KaxChapterEditionUID it's supposed to target
+    - This release is not binary compatible to 1.2.x.
+
 2011-06-26 robux4/mosu
 New 1.2.0 version:
    - skip data from KaxBlockVirtual as it should not be used
@@ -988,7 +1004,7 @@ New 0.9.0 version:

 	* trunk/libmatroska/matroska/KaxVersion.h: test SSL authentication

-2004-07-08 12:02  
+2004-07-08 12:02

 	* trunk/libmatroska/matroska/KaxVersion.h: Test changes

@@ -1974,4 +1990,3 @@ 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
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,198 +0,0 @@
-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
@@ -1,17 +0,0 @@
-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
@@ -1,26 +0,0 @@
-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
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
--- a/debian/docs
+++ b/debian/docs
--- a/debian/libmatroska-dev.dirs
+++ b/debian/libmatroska-dev.dirs
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
--- a/debian/libmatroska-dev.files
+++ b/debian/libmatroska-dev.files
@@ -1,2 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
--- a/debian/rules
+++ b/debian/rules
@@ -1,95 +0,0 @@
-#!/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.proj
+++ b/libmatroska.proj
@@ -2,7 +2,7 @@

 LIB matroska
 {
-  PROJECT_VERSION 1.2.0
+  PROJECT_VERSION 1.3.0

  INCLUDE .
  EXPINCLUDE .
--- a/make/Doxyfile
+++ b/make/Doxyfile
@@ -1,211 +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          = 
+# 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/linux/Makefile
+++ b/make/linux/Makefile
@@ -1,178 +1,179 @@
-# 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.4
-
-# 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
+# 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
+
+ifeq (Darwin,$(shell uname -s))
+link=static
+else
+link=both
+endif
+
+targets_both = staticlib sharedlib
+targets_shared = sharedlib
+targets_static = staticlib
+
+SRC_DIR=$(CWD)/../../src/
+INCLUDE_DIR=$(CWD)/../../matroska
+MUX_SRC_DIR=$(CWD)/../../test/mux/
+TAG_SRC_DIR=$(CWD)/../../test/tags/
+
+# Libraries
+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.6
+
+# 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 -Wextra -Wno-unknown-pragmas -D_GNU_SOURCE -Wshadow
+COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
+LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
+DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
+
+all: $(targets_$(link))
+
+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 $@ $<
+
+install: $(targets_$(link):%=install_%) install_headers 
+
+install_headers:
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
+	for i in $(INCLUDE_DIR)/*.h; do \
+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
+	done
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
+	for i in $(INCLUDE_DIR)/c/*.h; do \
+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
+	done
+
+install_staticlib: $(LIBRARY)
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
+
+install_sharedlib: $(LIBRARY_SO)
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
+	ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
+
+ifneq ($(wildcard .depend),)
+include .depend
+endif
+
+# DO NOT DELETE
--- a/make/linux/Makefile.rule
+++ b/make/linux/Makefile.rule
@@ -1,98 +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)
+##
+## 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
@@ -1,18 +1,18 @@
-#!/bin/sh
-
-# A small script that looks for duplicate EBML IDs in all of libmatroska's
-# source files.
-
-echo 'Duplicate IDs:'
-grep -h '^EbmlId.*_TheId' ../../src/*cpp | \
-  sed -e 's/TheId/TheId /' | \
-  awk '{ print $3 }' | \
-  sed -e 's/(//' -e 's/,//' | \
-  sort  | \
-  uniq -d | \
-( while read id ; do
-    echo ''
-    echo ${id}:
-    grep -i $id ../../src/*cpp
-  done )
-
+#!/bin/sh
+
+# A small script that looks for duplicate EBML IDs in all of libmatroska's
+# source files.
+
+echo 'Duplicate IDs:'
+grep -h '^EbmlId.*_TheId' ../../src/*cpp | \
+  sed -e 's/TheId/TheId /' | \
+  awk '{ print $3 }' | \
+  sed -e 's/(//' -e 's/,//' | \
+  sort  | \
+  uniq -d | \
+( while read id ; do
+    echo ''
+    echo ${id}:
+    grep -i $id ../../src/*cpp
+  done )
+
--- a/make/linux/fedora-core.spec
+++ b/make/linux/fedora-core.spec
@@ -1,7 +1,7 @@
 # SPEC file for (at least) Fedora Core 1, 2, 3

 Name: 		libmatroska
-Version: 1.2.0
+Version: 1.4.0
 Release: 1
 License: 	LGPL
 Summary:	Matroska Video Container
--- a/make/linux/suse.spec
+++ b/make/linux/suse.spec
@@ -14,7 +14,7 @@ BuildRequires: bzip2 cpp libebml make tar zlib zlib-devel binutils gcc gcc-c++ l

 Name:         libmatroska
 URL:          http://dl.matroska.org/downloads/libmatroska/
-Version: 1.2.0
+Version: 1.4.0
 Release: 1
 Summary:      library to deal with matroska files.
 License:      LGPL
--- a/make/makedoc.sh
+++ b/make/makedoc.sh
@@ -1,7 +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
+#!/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/matroska/FileKax.h
+++ b/matroska/FileKax.h
@@ -1,163 +1,163 @@
-/****************************************************************************
-** libmatroska : parse Matroska files, see http://www.matroska.org/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libmatroska.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** 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.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: FileKax.h,v 1.5 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#ifndef LIBMATROSKA_FILE_H
-#define LIBMATROSKA_FILE_H
-
-//#include <vector>
-
-#include "matroska/KaxTypes.h"
-#include "ebml/IOCallback.h"
-//#include "MainHeader.h"
-//#include "TrackType.h"
-//#include "StreamInfo.h"
-//#include "Cluster.h"
-//#include "CodecHeader.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-//class Track;
-//class Frame;
-
-/*!
-    \class MATROSKA_DLL_API FileMatroska
-    \brief General container of all the parameters and data of an Matroska file
-    \todo Handle the filename and next filename
-    \todo Handle the IOCallback selection/type
-*/
-class MATROSKA_DLL_API FileMatroska {
-    public:
-		FileMatroska(IOCallback & output);
-		~FileMatroska();
-#ifdef OLD
-	filepos_t RenderHead(const std::string & aEncoderApp);
-	uint32 ReadHead();
-	uint32 ReadTracks();
-	uint32 ReadCodec();
-	void Close(const uint32 aTimeLength);
-
-	inline void type_SetInfo(const std::string & aStr) {myMainHeader.type_SetInfo(aStr);}
-	inline void type_SetAds(const std::string & aStr) {myMainHeader.type_SetAds(aStr);}
-	inline void type_SetSize(const std::string & aStr) {myMainHeader.type_SetSize(aStr);}
-	inline void type_SetSize(uint64 aSize) {myMainHeader.type_SetSize(aSize);}
-
-	inline uint8 GetTrackNumber() const { return myTracks.size(); }
-
-	void track_SetName(Track * aTrack, const std::string & aName);
-	void track_SetLaced(Track * aTrack, bool bLaced = true);
-
-	Track * CreateTrack(const track_type aType);
-	inline Track * GetTrack(const uint8 aTrackNb) const
-	{
-	    if (aTrackNb > myTracks.size())
-		return NULL;
-	    else
-		return myTracks[aTrackNb-1];
-	}
-
-	void Track_GetInfo(const Track * aTrack, TrackInfo & aTrackInfo) const;
-	
-	void Track_SetInfo_Audio(Track * aTrack, const TrackInfoAudio & aTrackInfo);
-	void Track_GetInfo_Audio(const Track * aTrack, TrackInfoAudio & aTrackInfo) const;
-
-	void Track_SetInfo_Video(Track * aTrack, const TrackInfoVideo & aTrackInfo);
-	void Track_GetInfo_Video(const Track * aTrack, TrackInfoVideo & aTrackInfo) const;
-
-	void SelectReadingTrack(Track * aTrack, bool select = true);
-
-	/*!
-	    \return wether the frame has been added or not
-	*/
-	bool AddFrame(Track * aTrack, const uint32 aTimecode, const binary *aFrame, const uint32 aFrameSize,
-		     bool aKeyFrame = true, bool aBFrame = false);
-
-	/*!
-	    \return wether the frame has been read or not
-	*/
-	bool ReadFrame(Track * & aTrack, uint32 & aTimecode, const binary * & aFrame, uint32 & aFrameSize,
-		     bool & aKeyFrame, bool & aBFrame);
-
-	/*
-	    Render the pending cluster to file
-	*/
-	void Flush();
-
-	void SetMaxClusterSize(const uint32 value);
-	void SetMinClusterSize(const uint32 value) {myMinClusterSize = value;}
-
-    protected:
-	MainHeader myMainHeader;
-
-	std::vector<Track *> myTracks;
-	std::vector<uint8> mySelectedTracks;
-
-//	Track *findTrack(Track * aTrack) const;
-
-	Cluster  myCurrWriteCluster; /// \todo merge with the write one ?
-	uint32   myReadBlockNumber;
-	Cluster  myCurrReadCluster;
-	binary * myCurrReadBlock;      ///< The buffer containing the current read block
-	uint32   myCurrReadBlockSize;  ///< The size of the buffer containing the current read block
-	uint8    myCurrReadBlockTrack; ///< The track number of the current track to read
-
-	uint32 myMaxClusterSize;
-	uint32 myMinClusterSize;
-
-	StreamInfo myStreamInfo;
-
-	CodecHeader myCodecHeader;
-
-	inline bool IsMyTrack(const Track * aTrack) const;
-	inline bool IsReadingTrack(const uint8 aTrackNum) const;
-#endif // OLD
-	IOCallback & myFile;
-
-};
-
-END_LIBMATROSKA_NAMESPACE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-MATROSKA_DLL_API void matroska_init();
-MATROSKA_DLL_API void matroska_done();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // FILE_KAX_HPP
+/****************************************************************************
+** libmatroska : parse Matroska files, see http://www.matroska.org/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libmatroska.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** 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
+**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id: FileKax.h,v 1.5 2004/04/14 23:26:17 robux4 Exp $
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+#ifndef LIBMATROSKA_FILE_H
+#define LIBMATROSKA_FILE_H
+
+//#include <vector>
+
+#include "matroska/KaxTypes.h"
+#include "ebml/IOCallback.h"
+//#include "MainHeader.h"
+//#include "TrackType.h"
+//#include "StreamInfo.h"
+//#include "Cluster.h"
+//#include "CodecHeader.h"
+
+using namespace LIBEBML_NAMESPACE;
+
+START_LIBMATROSKA_NAMESPACE
+
+//class Track;
+//class Frame;
+
+/*!
+    \class MATROSKA_DLL_API FileMatroska
+    \brief General container of all the parameters and data of an Matroska file
+    \todo Handle the filename and next filename
+    \todo Handle the IOCallback selection/type
+*/
+class MATROSKA_DLL_API FileMatroska {
+    public:
+		FileMatroska(IOCallback & output);
+		~FileMatroska();
+#ifdef OLD
+	filepos_t RenderHead(const std::string & aEncoderApp);
+	uint32 ReadHead();
+	uint32 ReadTracks();
+	uint32 ReadCodec();
+	void Close(const uint32 aTimeLength);
+
+	inline void type_SetInfo(const std::string & aStr) {myMainHeader.type_SetInfo(aStr);}
+	inline void type_SetAds(const std::string & aStr) {myMainHeader.type_SetAds(aStr);}
+	inline void type_SetSize(const std::string & aStr) {myMainHeader.type_SetSize(aStr);}
+	inline void type_SetSize(uint64 aSize) {myMainHeader.type_SetSize(aSize);}
+
+	inline uint8 GetTrackNumber() const { return myTracks.size(); }
+
+	void track_SetName(Track * aTrack, const std::string & aName);
+	void track_SetLaced(Track * aTrack, bool bLaced = true);
+
+	Track * CreateTrack(const track_type aType);
+	inline Track * GetTrack(const uint8 aTrackNb) const
+	{
+	    if (aTrackNb > myTracks.size())
+		return NULL;
+	    else
+		return myTracks[aTrackNb-1];
+	}
+
+	void Track_GetInfo(const Track * aTrack, TrackInfo & aTrackInfo) const;
+	
+	void Track_SetInfo_Audio(Track * aTrack, const TrackInfoAudio & aTrackInfo);
+	void Track_GetInfo_Audio(const Track * aTrack, TrackInfoAudio & aTrackInfo) const;
+
+	void Track_SetInfo_Video(Track * aTrack, const TrackInfoVideo & aTrackInfo);
+	void Track_GetInfo_Video(const Track * aTrack, TrackInfoVideo & aTrackInfo) const;
+
+	void SelectReadingTrack(Track * aTrack, bool select = true);
+
+	/*!
+	    \return wether the frame has been added or not
+	*/
+	bool AddFrame(Track * aTrack, const uint32 aTimecode, const binary *aFrame, const uint32 aFrameSize,
+		     bool aKeyFrame = true, bool aBFrame = false);
+
+	/*!
+	    \return wether the frame has been read or not
+	*/
+	bool ReadFrame(Track * & aTrack, uint32 & aTimecode, const binary * & aFrame, uint32 & aFrameSize,
+		     bool & aKeyFrame, bool & aBFrame);
+
+	/*
+	    Render the pending cluster to file
+	*/
+	void Flush();
+
+	void SetMaxClusterSize(const uint32 value);
+	void SetMinClusterSize(const uint32 value) {myMinClusterSize = value;}
+
+    protected:
+	MainHeader myMainHeader;
+
+	std::vector<Track *> myTracks;
+	std::vector<uint8> mySelectedTracks;
+
+//	Track *findTrack(Track * aTrack) const;
+
+	Cluster  myCurrWriteCluster; /// \todo merge with the write one ?
+	uint32   myReadBlockNumber;
+	Cluster  myCurrReadCluster;
+	binary * myCurrReadBlock;      ///< The buffer containing the current read block
+	uint32   myCurrReadBlockSize;  ///< The size of the buffer containing the current read block
+	uint8    myCurrReadBlockTrack; ///< The track number of the current track to read
+
+	uint32 myMaxClusterSize;
+	uint32 myMinClusterSize;
+
+	StreamInfo myStreamInfo;
+
+	CodecHeader myCodecHeader;
+
+	inline bool IsMyTrack(const Track * aTrack) const;
+	inline bool IsReadingTrack(const uint8 aTrackNum) const;
+#endif // OLD
+	IOCallback & myFile;
+
+};
+
+END_LIBMATROSKA_NAMESPACE
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+MATROSKA_DLL_API void matroska_init();
+MATROSKA_DLL_API void matroska_done();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // FILE_KAX_HPP
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@@ -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 const uint32   Size()   const {return mySize;};
+		virtual uint32   Size()   const {return mySize;};
 		bool    FreeBuffer(const DataBuffer & aBuffer) {
 			bool bResult = true;
 			if (myBuffer != NULL && bValidValue) {
@@ -305,7 +305,6 @@ 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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
@@ -1,70 +1,70 @@
-/****************************************************************************
-** libmatroska : parse Matroska files, see http://www.matroska.org/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** 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.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: KaxConfig.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Moritz Bunkus <moritz @ bunkus.org>
-*/
-#ifndef LIBMATROSKA_CONFIG_H
-#define LIBMATROSKA_CONFIG_H
-
-#define LIBMATROSKA_NAMESPACE       libmatroska
-
-#if defined(NO_NAMESPACE) // for older GCC
-# define START_LIBMATROSKA_NAMESPACE
-# define END_LIBMATROSKA_NAMESPACE
-#else // NO_NAMESPACE
-# define START_LIBMATROSKA_NAMESPACE namespace LIBMATROSKA_NAMESPACE {
-# define END_LIBMATROSKA_NAMESPACE   };
-#endif // NO_NAMESPACE
-
-// There are special implementations for certain platforms. For example on Windows
-// we use the Win32 file API. here we set the appropriate macros.
-#if defined(_WIN32)||defined(WIN32)
-
-# if defined(MATROSKA_DLL)
-#  if defined(MATROSKA_DLL_EXPORT)
-#   define MATROSKA_DLL_API __declspec(dllexport)
-#  else // MATROSKA_DLL_EXPORT
-#   define MATROSKA_DLL_API __declspec(dllimport)
-#  endif // MATROSKA_DLL_EXPORT
-# else // MATROSKA_DLL
-#  define MATROSKA_DLL_API
-# endif // MATROSKA_DLL
-
-#else
-# define MATROSKA_DLL_API
-#endif
-
-#if !defined(MATROSKA_VERSION)
-#define MATROSKA_VERSION  2
-#endif // MATROSKA_VERSION
-
-
-#endif // LIBMATROSKA_CONFIG_H
+/****************************************************************************
+** libmatroska : parse Matroska files, see http://www.matroska.org/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** 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
+**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id: KaxConfig.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+	\author Moritz Bunkus <moritz @ bunkus.org>
+*/
+#ifndef LIBMATROSKA_CONFIG_H
+#define LIBMATROSKA_CONFIG_H
+
+#define LIBMATROSKA_NAMESPACE       libmatroska
+
+#if defined(NO_NAMESPACE) // for older GCC
+# define START_LIBMATROSKA_NAMESPACE
+# define END_LIBMATROSKA_NAMESPACE
+#else // NO_NAMESPACE
+# define START_LIBMATROSKA_NAMESPACE namespace LIBMATROSKA_NAMESPACE {
+# define END_LIBMATROSKA_NAMESPACE   };
+#endif // NO_NAMESPACE
+
+// There are special implementations for certain platforms. For example on Windows
+// we use the Win32 file API. here we set the appropriate macros.
+#if defined(_WIN32)||defined(WIN32)
+
+# if defined(MATROSKA_DLL)
+#  if defined(MATROSKA_DLL_EXPORT)
+#   define MATROSKA_DLL_API __declspec(dllexport)
+#  else // MATROSKA_DLL_EXPORT
+#   define MATROSKA_DLL_API __declspec(dllimport)
+#  endif // MATROSKA_DLL_EXPORT
+# else // MATROSKA_DLL
+#  define MATROSKA_DLL_API
+# endif // MATROSKA_DLL
+
+#else
+# define MATROSKA_DLL_API
+#endif
+
+#if !defined(MATROSKA_VERSION)
+#define MATROSKA_VERSION  2
+#endif // MATROSKA_VERSION
+
+
+#endif // LIBMATROSKA_CONFIG_H
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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
@@ -1,62 +1,62 @@
-/****************************************************************************
-** libmatroska : parse Matroska files, see http://www.matroska.org/
-**
-** <file/class MATROSKA_DLL_API description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libmatroska.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** 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.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: KaxSegment.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#ifndef LIBMATROSKA_SEGMENT_H
-#define LIBMATROSKA_SEGMENT_H
-
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlMaster.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-DECLARE_MKX_MASTER_CONS(KaxSegment)
-	public:
-		/*!
-			\brief give the position of the element in the segment
-		*/
-		uint64 GetRelativePosition(const EbmlElement & Elt) const;
-		uint64 GetRelativePosition(uint64 aGlobalPosition) const;
-
-		/*!
-			\brief give the position of the element in the file
-		*/
-		uint64 GetGlobalPosition(uint64 aRelativePosition) const;
-};
-
-END_LIBMATROSKA_NAMESPACE
-
-#endif // LIBMATROSKA_SEGMENT_H
+/****************************************************************************
+** libmatroska : parse Matroska files, see http://www.matroska.org/
+**
+** <file/class MATROSKA_DLL_API description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libmatroska.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** 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
+**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id: KaxSegment.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+#ifndef LIBMATROSKA_SEGMENT_H
+#define LIBMATROSKA_SEGMENT_H
+
+#include "matroska/KaxTypes.h"
+#include "ebml/EbmlMaster.h"
+#include "matroska/KaxDefines.h"
+
+using namespace LIBEBML_NAMESPACE;
+
+START_LIBMATROSKA_NAMESPACE
+
+DECLARE_MKX_MASTER_CONS(KaxSegment)
+	public:
+		/*!
+			\brief give the position of the element in the segment
+		*/
+		uint64 GetRelativePosition(const EbmlElement & Elt) const;
+		uint64 GetRelativePosition(uint64 aGlobalPosition) const;
+
+		/*!
+			\brief give the position of the element in the file
+		*/
+		uint64 GetGlobalPosition(uint64 aRelativePosition) const;
+};
+
+END_LIBMATROSKA_NAMESPACE
+
+#endif // LIBMATROSKA_SEGMENT_H
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@@ -157,6 +157,9 @@ public:

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

 DECLARE_MKX_MASTER(KaxSlices)
@@ -243,7 +246,14 @@ 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
@@ -297,6 +307,14 @@ 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)
 };

@@ -321,6 +339,9 @@ 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);
@@ -501,6 +522,14 @@ 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)
 };

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

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

@@ -607,9 +641,7 @@ public:
 	virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
 };

-DECLARE_MKX_BINARY (KaxChapterSegmentEditionUID)
-public:
-	virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
+DECLARE_MKX_UINTEGER(KaxChapterSegmentEditionUID)
 };

 DECLARE_MKX_UINTEGER(KaxChapterPhysicalEquiv)
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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
@@ -1,59 +1,59 @@
-/****************************************************************************
-** libmatroska : parse Matroska files, see http://www.matroska.org/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libmatroska.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** 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.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: KaxTypes.h,v 1.4 2004/04/14 23:26:17 robux4 Exp $
-*/
-#ifndef LIBMATROSKA_TYPES_H
-#define LIBMATROSKA_TYPES_H
-
-#include "matroska/KaxConfig.h"
-#include "ebml/EbmlTypes.h"
-#include "matroska/c/libmatroska_t.h"
-
-START_LIBMATROSKA_NAMESPACE
-
-enum LacingType {
-	LACING_NONE = 0,
-	LACING_XIPH,
-	LACING_FIXED,
-	LACING_EBML,
-	LACING_AUTO
-};
-
-enum BlockBlobType {
-	BLOCK_BLOB_NO_SIMPLE = 0,
-	BLOCK_BLOB_SIMPLE_AUTO,
-	BLOCK_BLOB_ALWAYS_SIMPLE,
-};
-
-END_LIBMATROSKA_NAMESPACE
-
-#endif // LIBMATROSKA_TYPES_H
+/****************************************************************************
+** libmatroska : parse Matroska files, see http://www.matroska.org/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libmatroska.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** 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
+**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id: KaxTypes.h,v 1.4 2004/04/14 23:26:17 robux4 Exp $
+*/
+#ifndef LIBMATROSKA_TYPES_H
+#define LIBMATROSKA_TYPES_H
+
+#include "matroska/KaxConfig.h"
+#include "ebml/EbmlTypes.h"
+#include "matroska/c/libmatroska_t.h"
+
+START_LIBMATROSKA_NAMESPACE
+
+enum LacingType {
+	LACING_NONE = 0,
+	LACING_XIPH,
+	LACING_FIXED,
+	LACING_EBML,
+	LACING_AUTO
+};
+
+enum BlockBlobType {
+	BLOCK_BLOB_NO_SIMPLE = 0,
+	BLOCK_BLOB_SIMPLE_AUTO,
+	BLOCK_BLOB_ALWAYS_SIMPLE,
+};
+
+END_LIBMATROSKA_NAMESPACE
+
+#endif // LIBMATROSKA_TYPES_H
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@@ -40,10 +40,10 @@

 START_LIBMATROSKA_NAMESPACE

-#define LIBMATROSKA_VERSION 0x010200
+#define LIBMATROSKA_VERSION 0x010400

-static const std::string KaxCodeVersion = "1.2.0";
-static const std::string KaxCodeDate    = __TIMESTAMP__;
+extern const std::string KaxCodeVersion;
+extern const std::string KaxCodeDate;

 /*!
 	\todo Improve the CRC/ECC system (backward and forward possible ?) to fit streaming/live writing/simple reading
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@@ -161,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
@@ -238,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();
@@ -268,7 +268,7 @@ filepos_t KaxBlockVirtual::UpdateSize(bool bSaveDefault, bool bForceRender)
 	\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;
@@ -1034,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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@@ -52,12 +52,16 @@ KaxReferenceBlock::KaxReferenceBlock(EBML_EXTRA_DEF)
 :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)
 {
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
@@ -120,7 +120,6 @@ const KaxCuePoint * KaxCues::GetTimecodePoint(uint64 aTimecode) const
 	uint64 TimecodeToLocate = aTimecode / GlobalTimecodeScale();
 	const KaxCuePoint * aPointPrev = NULL;
 	uint64 aPrevTime = 0;
-	const KaxCuePoint * aPointNext = NULL;
 	uint64 aNextTime = EBML_PRETTYLONGINT(0xFFFFFFFFFFFF);

    EBML_MASTER_CONST_ITERATOR Itr;
@@ -139,7 +138,6 @@ const KaxCuePoint * KaxCues::GetTimecodePoint(uint64 aTimecode) const
 				}
 				if (_Time < aNextTime && _Time > TimecodeToLocate) {
 					aNextTime= _Time;
-					aPointNext = tmp;
 				}
 			}
 		}
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/src/KaxSemantic.cpp
+++ b/src/KaxSemantic.cpp
--- 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html 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
@@ -1,40 +1,43 @@
-/****************************************************************************
-** libmatroska : parse Matroska files, see http://www.matroska.org/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
-**
-** This file is part of libmatroska.
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-** 
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Lesser General Public License for more details.
-** 
-** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-**
-** 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.
-**
-**********************************************************************/
-
-/*!
-	\file
-	\version \$Id: KaxVersion.cpp 640 2004-07-09 21:05:36Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-
-#include "matroska/KaxVersion.h"
-
-START_LIBMATROSKA_NAMESPACE
-
-END_LIBMATROSKA_NAMESPACE
+/****************************************************************************
+** libmatroska : parse Matroska files, see http://www.matroska.org/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2010 Steve Lhomme.  All rights reserved.
+**
+** This file is part of libmatroska.
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+**
+** 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
+**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+	\file
+	\version \$Id: KaxVersion.cpp 640 2004-07-09 21:05:36Z mosu $
+	\author Steve Lhomme     <robux4 @ users.sf.net>
+*/
+
+#include "matroska/KaxVersion.h"
+
+START_LIBMATROSKA_NAMESPACE
+
+const std::string KaxCodeVersion = "1.4.0";
+const std::string KaxCodeDate    = __TIMESTAMP__;
+
+END_LIBMATROSKA_NAMESPACE
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,10 +1,10 @@
-## libmatroska Makefile
-## (c) 2002 Steve Lhomme
-## This software is licensed under the LGPL, see LGPL.txt
-
-all: endian
-	echo "Making endianess tests"
-	(cd endian; make)
-clean:
-	echo "Cleaning all tests"
-	(cd endian; make $@)
+## libmatroska Makefile
+## (c) 2002 Steve Lhomme
+## This software is licensed under the LGPL, see LICENSE.LGPL
+
+all: endian
+	echo "Making endianess tests"
+	(cd endian; make)
+clean:
+	echo "Cleaning all tests"
+	(cd endian; make $@)
--- a/test/ebml/Makefile
+++ b/test/ebml/Makefile
@@ -1,62 +1,62 @@
-# 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 -I../../src/
-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=test00
-
-# 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))
-
-OBJ=$(objects) test00.o
-
-DEPENDFLAGS  = ${CXXFLAGS} ${INCLUDE}
-
-# Build rules
-%.o: %$(EXTENSION)
-	$(CXX) $(CXXFLAGS) $(INCLUDE) -o $@ $<
-
-$(PROGRAM): $(OBJ)
-#	$(AR) $@ $(objects)
-#	$(RANLIB) $@
-	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-	${LD} -o $@ ${LDFLAGS} ${OBJ} ${LIBS} ${EXTRA_LIBS}
-
-clean:
-	rm -f $(OBJ)
-	rm -f $(dependencies)
-	rm -f $(PROGRAM)
-	rm -f CORE
-
-# what are the source dependencies
-depend: $(sources)
-	$(DEPEND) $(DEPENDFLAGS) $(sources)
-
-# DO NOT DELETE
+# 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 -I../../src/
+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=test00
+
+# 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))
+
+OBJ=$(objects) test00.o
+
+DEPENDFLAGS  = ${CXXFLAGS} ${INCLUDE}
+
+# Build rules
+%.o: %$(EXTENSION)
+	$(CXX) $(CXXFLAGS) $(INCLUDE) -o $@ $<
+
+$(PROGRAM): $(OBJ)
+#	$(AR) $@ $(objects)
+#	$(RANLIB) $@
+	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+	${LD} -o $@ ${LDFLAGS} ${OBJ} ${LIBS} ${EXTRA_LIBS}
+
+clean:
+	rm -f $(OBJ)
+	rm -f $(dependencies)
+	rm -f $(PROGRAM)
+	rm -f CORE
+
+# what are the source dependencies
+depend: $(sources)
+	$(DEPEND) $(DEPENDFLAGS) $(sources)
+
+# DO NOT DELETE
--- a/test/ebml/test0.cpp
+++ b/test/ebml/test0.cpp
@@ -7,24 +7,21 @@
 **
 ** This file is part of libmatroska.
 **
-** 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 file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** 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.
-** See http://www.matroska.org/license/gpl/ for GPL licensing information.
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** 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
 **
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/test/ebml/test00.cpp
+++ b/test/ebml/test00.cpp
@@ -7,24 +7,21 @@
 **
 ** This file is part of libmatroska.
 **
-** 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 file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** 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.
-** See http://www.matroska.org/license/gpl/ for GPL licensing information.
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** 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
 **
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/test/mux/test6.cpp
+++ b/test/mux/test6.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/test/mux/test8.cpp
+++ b/test/mux/test8.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/test/tags/test9.cpp
+++ b/test/tags/test9.cpp
@@ -7,24 +7,21 @@
 **
 ** This file is part of libmatroska.
 **
-** 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 file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** 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.
-** See http://www.matroska.org/license/gpl/ for GPL licensing information.
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** 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
 **
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
--- a/test/utf8/test5.cpp
+++ b/test/utf8/test5.cpp
@@ -7,24 +7,21 @@
 **
 ** This file is part of libmatroska.
 **
-** 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 file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** 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.
-** See http://www.matroska.org/license/gpl/ for GPL licensing information.
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+** 
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+** 
+** 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
 **
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
Author	SHA1	Message	Date
Steve Lhomme	fb1eddb293	add support for SeekPreRoll	2013-06-15 18:27:49 +02:00
Steve Lhomme	edcf087607	add DiscardPadding and CodecDelay elements	2013-06-15 18:22:34 +02:00
Moritz Bunkus	de304c170a	Merge pull request #1 from RedDwarf69/master Linux packaging	2013-04-20 02:54:23 -07:00
Cristian Morales Vega	40a5b6e130	Update licensing information - Substitute LICENSE.LGPL for the latest copy from http://www.gnu.org/ - Update the FSF address and links in all the file headers - Relicense QPL/GPL files to LGPL	2013-04-20 09:57:44 +01:00
Cristian Morales Vega	e23d29d21b	Use Linux-style EOL for non Windows specific files	2013-04-14 16:34:22 +01:00
Cristian Morales Vega	a8f9a28def	Fix typo	2013-04-14 16:29:57 +01:00
Cristian Morales Vega	773e7d7755	Add DESTDIR option to Linux Makefile	2013-04-14 16:29:21 +01:00
Cristian Morales Vega	4f5d0b977c	Add "link" option to Linux Makefile	2013-04-14 16:27:32 +01:00
Cristian Morales Vega	1a15920ee4	Stop using -ansi -fno-gnu-keywords in Linux There is no need for -fno-gnu-keywords (which was implied by -ansi) in the current code. -ansi disables GCC built-in functions, which add optimizations and extra security checks in some cases. It may be good to use it (and -pedantic) while developing to try to keep the code ANSI standard, but users should have binaries compiled without the option.	2013-04-14 16:23:32 +01:00
Moritz Bunkus	264a7537e5	Remove Debian build files & update ChangeLog	2013-03-19 20:13:20 +01:00
Moritz Bunkus	bdcc3ef3a1	Update ChangeLog	2013-03-19 17:55:52 +01:00
Moritz Bunkus	734b6a1803	Add new element 'DefaultDecodedFieldDuration' See http://lists.matroska.org/pipermail/matroska-devel/2012-December/004371.html	2013-03-19 12:07:42 +01:00
Moritz Bunkus	c718d51867	Ignore files built during compilation	2013-03-19 12:06:36 +01:00
Steve Lhomme	f3f1214c13	add alphaMode for WebM	2013-02-05 18:56:40 +01:00
Moritz Bunkus	08eb86ee0a	Sync with specs: remove TrackTimecodeDenominator; add ChapterStringUID git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@869 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2012-12-02 14:12:58 +00:00
Steve Lhomme	0a96109b73	specs: introduce ChapterStringUID for WebVTT cue identifiers git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@867 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2012-10-28 07:58:23 +00:00
Moritz Bunkus	0f3f33bf6f	Make CueDuration a child of CueTrackPositions git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@862 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2012-09-24 21:39:23 +00:00
Moritz Bunkus	4ac544deac	Add missing RenderData() declaration for KaxTrackTimecodeScale git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@861 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2012-09-24 21:01:00 +00:00
Steve Lhomme	a463c247a6	update the ChangeLog with recent changes git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@858 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2012-09-23 09:53:17 +00:00
Steve Lhomme	e06fb9db92	add TimecodeScaleDenominator to make a fraction with TimecodeScale in Matroska v4 git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@856 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2012-09-23 09:18:56 +00:00
Steve Lhomme	726c4bee88	no more TrackTimecodeScale in Matroska v4 no more TrackTimecodeScale writing in libmatroska git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@853 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2012-09-23 08:44:42 +00:00
Moritz Bunkus	3fbe2877fb	Bump version number, library .so version number, add ChangeLog info git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@849 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2012-09-22 22:30:44 +00:00
Moritz Bunkus	7648e65aac	Add new elements from specdata.xml git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@848 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2012-09-22 22:30:01 +00:00
Moritz Bunkus	0f6409c2f1	Remove conversion operator that will never be called git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@843 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2012-09-04 07:53:21 +00:00
Moritz Bunkus	699562e709	Fix several gcc warnings occurring with -Wextra Warnings fixed are: - warning: type qualifiers ignored on function return type [-Wignored-qualifiers] - warning: unused parameter ... [-Wunused-parameter] - warning: comparison is always true due to limited range of data type [-Wtype-limits] git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@823 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2011-11-25 21:23:21 +00:00
Moritz Bunkus	94391f1f4e	Bump library so version number due to binary incompatible changes git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@815 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2011-09-23 13:44:05 +00:00
Moritz Bunkus	c5f95ca5ad	changelog update, version number updates git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@812 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2011-09-23 11:54:54 +00:00
Steve Lhomme	945625f4e3	libmatroska: bump the version to 1.3.0 as the KaxChapterSegmentEditionUID is not binary compatible git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@809 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2011-09-11 15:56:11 +00:00
Steve Lhomme	4e905afe8d	specs: make ChapterSegmentEditionUID an unsigned integer to match the ChapterEditionUID it's supposed to target git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@807 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2011-09-11 15:13:32 +00:00
Moritz Bunkus	c5e1f64a43	Move definition of KaxCodeVersion into the library git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@804 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2011-09-11 09:04:00 +00:00
Moritz Bunkus	b5306bbeda	Always initialize member variables git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@792 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2011-08-24 18:59:02 +00:00
Moritz Bunkus	9fd2a78333	Removed set but unused variable git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@787 a6f86f6d-0131-4f8e-9e7b-e335508773d5	2011-07-11 20:08:46 +00:00