Packman Build Service PMBS

makemkv.spec Changed

@@ -14,13 +14,14 @@
 
 Name:           makemkv
 Summary:        DVD and BlueRay Ripping tool
-Version:        1.8.6
+Version:        1.8.7
 Release:        0.pm.1
 License:        see eula_en_linux.txt
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            http://www.makemkv.com
 Source0:        %{name}-oss-%{version}.tar.gz
 Source1:        %{name}-bin-%{version}.tar.gz
+Patch0:         %{name}-oss-%{version}.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       %{libnamedriveio} = %{version}-%{release}
 Requires:       %{libnamemakemkve} = %{version}-%{release}
@@ -90,20 +91,14 @@
 
 %prep
 %setup -q -n %{name}-oss-%{version}
+%patch0 -p1
 
 %build
-sed -i -e "s|\${PREFIX}/lib|%{_libdir}|g" makefile.linux
-sed -i -e "s|ldconfig|#ldconfig|g" makefile.linux
-sed -i -e "s|-O3|${RPM_OPT_FLAGS}|g" makefile.linux
-%__make -f makefile.linux
+%configure
+%{__make} %{?jobs:-j%{jobs}}
 
 %install
-sed -i -e "s|rm -f /usr/|#rm -f %{?buildroot:%{buildroot}}/usr/|g" makefile.linux
-sed -i -e "s|install -t /usr/|install -t %{?buildroot:%{buildroot}}/usr/|g" makefile.linux
-%{__mkdir_p} -p %{buildroot}%{_bindir}
-%{__mkdir_p} -p %{buildroot}%{_libdir}
-%{__mkdir_p} -p %{buildroot}%{_datadir}/applications
-%makeinstall -f makefile.linux
+%makeinstall
 %suse_update_desktop_file -c makemkv makemkv "makemkv" makemkv makemkv.png AudioVideo AudioVideoEditing
 tar xzf %{SOURCE1}
 %ifarch x86_64
@@ -152,6 +147,8 @@
 
 
 %changelog
+* Sat Dec 14 2013 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 1.8.7-0.pm.1
+- update to 1.8.7
 * Mon Nov 11 2013 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 1.8.6-0.pm.1
 - update to 1.8.6
 * Sat Sep 14 2013 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 1.8.5-0.pm.1
@@ -162,7 +159,7 @@
 - update to 1.8.2
 * Wed May 08 2013 Bernhard M. Wiedemann <bmwiedemann@opensuse.org> - 1.8.1-0.pm.1
 - update to 1.8.1
-* Fri Feb 21 2013 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 1.8.0-0.pm.1
+* Thu Feb 21 2013 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 1.8.0-0.pm.1
 - update to 1.8.0
 * Fri Jan 04 2013 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 1.7.10-0.pm.1
 - update to 1.7.10
@@ -190,7 +187,7 @@
 - update to 1.6.10
 * Sun May 29 2011 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 1.6.9-0.pm.1
 - update to 1.6.9
-* Mon Apr 24 2011 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 1.6.8-0.pm.1
+* Sun Apr 24 2011 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 1.6.8-0.pm.1
 - update to 1.6.8
 * Sun Apr 03 2011 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 1.6.6-0.pm.1
 - update to 1.6.6

makemkv-oss-1.8.7.diff Added

makemkv-bin-1.8.6.tar.gz/makefile.linux Deleted

@@ -1,56 +0,0 @@
-
-ARCH=$(shell uname -m)
-DESTDIR=
-
-ifeq ($(ARCH),i586)
-ARCH=i386
-ARCH_OK=1
-endif
-
-ifeq ($(ARCH),i686)
-ARCH=i386
-ARCH_OK=1
-endif
-
-ifeq ($(ARCH),x86_64)
-ARCH=amd64
-ARCH_OK=1
-endif
-
-ifneq ($(ARCH_OK),1)
-$(error MakeMKV is currently not available for architecture $(ARCH))
-endif
-
-all: tmp/eula_accepted
-	@echo "type \"sudo make -f makefile.linux install\" to install"
-
-clean:
-	-rm -rf tmp
-
-tmp/eula_accepted:
-	@mkdir -p tmp
-	@/bin/bash src/ask_eula.sh src/eula_en_linux.txt
-	@echo accepted > $@
-
-install: tmp/eula_accepted bin/$(ARCH)/makemkvcon
-	rm -f $(DESTDIR)/usr/bin/makemkvcon
-	rm -f $(DESTDIR)/usr/bin/mmdtsdec
-	rm -f $(DESTDIR)/usr/share/MakeMKV/*.mo.gz
-	install -d $(DESTDIR)/usr/share/MakeMKV
-	install -d $(DESTDIR)/usr/bin
-	install -t $(DESTDIR)/usr/bin bin/$(ARCH)/makemkvcon
-	install -t $(DESTDIR)/usr/bin bin/i386/mmdtsdec
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/default.mmcp.xml
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/flac.mmcp.xml
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/wdtv.mmcp.xml
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_deu.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_jpn.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_spa.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_ptb.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_dut.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_swe.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_ita.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_chi.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_pol.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_dan.mo.gz
-

makemkv-bin-1.8.7.tar.gz/Makefile Added

@@ -0,0 +1,56 @@
+
+ARCH=$(shell uname -m)
+DESTDIR=
+
+ifeq ($(ARCH),i586)
+ARCH=i386
+ARCH_OK=1
+endif
+
+ifeq ($(ARCH),i686)
+ARCH=i386
+ARCH_OK=1
+endif
+
+ifeq ($(ARCH),x86_64)
+ARCH=amd64
+ARCH_OK=1
+endif
+
+ifneq ($(ARCH_OK),1)
+$(error MakeMKV is currently not available for architecture $(ARCH))
+endif
+
+all: tmp/eula_accepted
+	@echo "type \"sudo make install\" to install"
+
+clean:
+	-rm -rf tmp
+
+tmp/eula_accepted:
+	@mkdir -p tmp
+	@/bin/bash src/ask_eula.sh src/eula_en_linux.txt
+	@echo accepted > $@
+
+install: tmp/eula_accepted bin/$(ARCH)/makemkvcon
+	rm -f $(DESTDIR)/usr/bin/makemkvcon
+	rm -f $(DESTDIR)/usr/bin/mmdtsdec
+	rm -f $(DESTDIR)/usr/share/MakeMKV/*.mo.gz
+	install -d $(DESTDIR)/usr/share/MakeMKV
+	install -d $(DESTDIR)/usr/bin
+	install -t $(DESTDIR)/usr/bin bin/$(ARCH)/makemkvcon
+	install -t $(DESTDIR)/usr/bin bin/i386/mmdtsdec
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/default.mmcp.xml
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/flac.mmcp.xml
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/wdtv.mmcp.xml
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_deu.mo.gz
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_jpn.mo.gz
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_spa.mo.gz
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_ptb.mo.gz
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_dut.mo.gz
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_swe.mo.gz
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_ita.mo.gz
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_chi.mo.gz
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_pol.mo.gz
+	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_dan.mo.gz
+

makemkv-bin-1.8.6.tar.gz/bin/amd64/makemkvcon -> makemkv-bin-1.8.7.tar.gz/bin/amd64/makemkvcon Changed

makemkv-bin-1.8.6.tar.gz/bin/i386/makemkvcon -> makemkv-bin-1.8.7.tar.gz/bin/i386/makemkvcon Changed

makemkv-bin-1.8.6.tar.gz/bin/i386/mmdtsdec -> makemkv-bin-1.8.7.tar.gz/bin/i386/mmdtsdec Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxTagMulti.h Deleted

@@ -1,745 +0,0 @@
-/****************************************************************************
-** libmatroska : parse Matroska files, see http://www.matroska.org/
-**
-** <file/class MATROSKA_DLL_API description>
-**
-** Copyright (C) 2002-2004 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: KaxTagMulti.h,v 1.9 2004/04/14 23:26:17 robux4 Exp $
-	\author Jory Stone     <jcsston @ toughguy.net>
-	\author Steve Lhomme   <robux4 @ users.sf.net>
-*/
-#ifndef LIBMATROSKA_TAGMULTI_H
-#define LIBMATROSKA_TAGMULTI_H
-
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlMaster.h"
-#include "ebml/EbmlDate.h"
-#include "ebml/EbmlFloat.h"
-#include "ebml/EbmlSInteger.h"
-#include "ebml/EbmlUInteger.h"
-#include "ebml/EbmlString.h"
-#include "ebml/EbmlUnicodeString.h"
-#include "ebml/EbmlBinary.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-enum KaxTagMultiCommercialTypes {
-	KaxTagMultiCommercialType_FilePurchase = 1, //Information on where to purchase this file. This is akin to the WPAY tag in ID3.
-	KaxTagMultiCommercialType_ItemPurchase,	//Information on where to purchase this album. This is akin to the WCOM tag in ID3.
-	KaxTagMultiCommercialType_Owner  //Information on the purchase that occurred for this file. This is akin to the OWNE tag in ID3.
-};
-enum KaxTagMultiDateTypes {
-	KaxTagMultiDateType_EncodingDate = 1, //The time that the encoding of this item was completed. This is akin to the TDEN tag in ID3.
-	KaxTagMultiDateType_RecordingDate, //The time that the recording began, and finished. This is akin to the TDRC tag in ID3.
-	KaxTagMultiDateType_ReleaseDate, //The time that the item was originaly released. This is akin to the TDRL tag in ID3.
-	KaxTagMultiDateType_OriginalReleaseDate, //The time that the item was originaly released if it is a remake. This is akin to the TDOR tag in ID3.
-	KaxTagMultiDateType_TaggingDate, //The time that the tags were done for this item. This is akin to the TDTG tag in ID3.
-	KaxTagMultiDateType_DigitizingDate  //The time that the item was tranfered to a digital medium. This is akin to the IDIT tag in RIFF
-};
-enum KaxTagMultiEntitiesTypes {
-	KaxTagMultiEntitiesType_LyricistTextWriter = 1, //The person that wrote the words/script for this item. This is akin to the TEXT tag in ID3.
-	KaxTagMultiEntitiesType_Composer, //The name of the composer of this item. This is akin to the TCOM tag in ID3.
-	KaxTagMultiEntitiesType_LeadPerformerSoloist, //This is akin to the TPE1 tag in ID3.
-	KaxTagMultiEntitiesType_BandOrchestraAccompaniment, //This is akin to the TPE2 tag in ID3.
-	KaxTagMultiEntitiesType_OriginalLyricistTextWriter, //This is akin to the TOLY tag in ID3.
-	KaxTagMultiEntitiesType_OriginalArtistPerformer, //This is akin to the TOPE tag in ID3.
-	KaxTagMultiEntitiesType_OriginalAlbumMovieShowTitle, //This is akin to the TOAL tag in ID3.
-	KaxTagMultiEntitiesType_ConductorPerformerRefinement, //This is akin to the TPE3 tag in ID3.
-	KaxTagMultiEntitiesType_InterpretedRemixedBy, //This is akin to the TPE4 tag in ID3.
-	KaxTagMultiEntitiesType_Director, //This is akin to the IART tag in RIFF
-	KaxTagMultiEntitiesType_ProducedBy, //This is akin to the IPRO tag in Extended RIFF
-	KaxTagMultiEntitiesType_Cinematographer, //This is akin to the ICNM tag in Extended RIFF
-	KaxTagMultiEntitiesType_ProductionDesigner, //This is akin to the IPDS tag in Extended RIFF
-	KaxTagMultiEntitiesType_CostumeDesigner, //This is akin to the ICDS tag in Extended RIFF
-	KaxTagMultiEntitiesType_ProductionStudio, //This is akin to the ISTD tag in Extended RIFF
-	KaxTagMultiEntitiesType_DistributedBy, //This is akin to the IDST tag in Extended RIFF
-	KaxTagMultiEntitiesType_CommissionedBy, //This is akin to the ICMS tag in RIFF
-	KaxTagMultiEntitiesType_Engineer, //This is akin to the IENG tag in RIFF
-	KaxTagMultiEntitiesType_EditedBy, //This is akin to the IEDT tag in Extended RIFF
-	KaxTagMultiEntitiesType_EncodedBy, //This is akin to the TENC tag in ID3.
-	KaxTagMultiEntitiesType_RippedBy, //This is akin to the IRIP tag in Extended RIFF
-	KaxTagMultiEntitiesType_InvolvedPeopleList, //A very general tag for everyone else that wants to be listed. This is akin to the TMCL tag in ID3.
-	KaxTagMultiEntitiesType_InternetRadioStationName, //This is akin to the TSRN tag in ID3.
-	KaxTagMultiEntitiesType_Publisher  //This is akin to the TPUB tag in ID3.
-};
-
-enum KaxTagMultiIdentifierTypes {
-	KaxTagMultiIdentifierType_ISRC = 1, //String, The International Standard Recording Code
-	KaxTagMultiIdentifierType_CDIdentifier, //Binary, This is a binary dump of the TOC of the CDROM that this item was taken from. This holds the same information as the MCDI in ID3.
-	KaxTagMultiIdentifierType_ISBN, //String, International Standard Book Number
-	KaxTagMultiIdentifierType_Catalog, //String, sometimes the EAN/UPC, often some letters followed by some numbers
-	KaxTagMultiIdentifierType_EAN, //String, EAN-13 bar code identifier
-	KaxTagMultiIdentifierType_UPC, //String, UPC-A bar code identifier
-	KaxTagMultiIdentifierType_LabelCode, //String, Typically printed as ________ (LC) xxxx) ~~~~~~~~ or _________ (LC) 0xxxx) ~~~~~~~~~ on CDs medias or covers, where xxxx is a 4-digit number.
-	KaxTagMultiIdentifierType_LCCN, //String, Library of Congress Control Number
-	KaxTagMultiIdentifierType_UniqueFileIdentifier, //Binary, This used for a dump of the UFID field in ID3. This field would only be used if the item was pulled from an MP3.
-	CDROM_CD_TEXT_PACK_TOC_INFO2  //Binary
-};
-
-enum KaxTagMultiLegalTypes {
-	KaxTagMultiLegalType_Copyright = 1, //The copyright information as per the copyright holder. This is akin to the TCOP tag in ID3.
-	KaxTagMultiLegalType_ProductionCopyright, //The copyright information as per the production copyright holder. This is akin to the TPRO tag in ID3.
-	KaxTagMultiLegalType_TermsOfUse  //The terms of use for this item. This is akin to the USER tag in ID3.
-};
-
-enum KaxTagMultiTitleTypes {
-	KaxTagMultiTitleType_TrackTitle = 1,
-		//The title of this item. In the case of a track, the Name element should be identical to the Name element.
-		//For example, for music you might label this "Canon in D", or for video's audio track you might use "English 5.1" This is akin to the TIT2 tag in ID3.
-	KaxTagMultiTitleType_AlbumMovieShowTitle,
-		//This is the name given to a grouping of tracks and/or chapters. 
-		//For example, all video, audio, and subtitle tracks for a movie would be grouped under this and be given the name of the movie. 
-		//All tracks for a particular CD would be grouped together under the title of the CD, or if all tracks for a CD were recorded as a single track, seperated by chapters, the same would apply.
-		//You could use this to label episode 3 of The Simpsons. This is akin to the TALB tag in ID3.
-	KaxTagMultiTitleType_SetTitle,	//This would be used to label a set of ID 2. For example, season 13 of The Simpsons.
-	KaxTagMultiTitleType_Series  //This would be used to label a set of ID 3. For example, The Simpsons.
-};
-
-class MATROSKA_DLL_API KaxTagMultiComment : public EbmlMaster {
-	public:
-		KaxTagMultiComment();
-		KaxTagMultiComment(const KaxTagMultiComment & ElementToClone) :EbmlMaster(ElementToClone) {}
-		static EbmlElement & Create() {return *(new KaxTagMultiComment);}
-		const EbmlCallbacks & Generic() const {return ClassInfos;}
-		static const EbmlCallbacks ClassInfos;
-		operator const EbmlId &() const {return ClassInfos.GlobalId;}
-		EbmlElement * Clone() const {return new KaxTagMultiComment(*this);}
-};
-
-class MATROSKA_DLL_API KaxTagMultiCommentName : public EbmlString {
-	public:
-		KaxTagMultiCommentName() {}
-		KaxTagMultiCommentName(const KaxTagMultiCommentName & ElementToClone) :EbmlString(ElementToClone) {}
-		static EbmlElement & Create() {return *(new KaxTagMultiCommentName);}
-		const EbmlCallbacks & Generic() const {return ClassInfos;}
-		static const EbmlCallbacks ClassInfos;
-		operator const EbmlId &() const {return ClassInfos.GlobalId;}
-		EbmlElement * Clone() const {return new KaxTagMultiCommentName(*this);}
-};
-
-class MATROSKA_DLL_API KaxTagMultiCommentComments : public EbmlUnicodeString {
-	public:
-		KaxTagMultiCommentComments() {}
-		KaxTagMultiCommentComments(const KaxTagMultiCommentComments & ElementToClone) :EbmlUnicodeString(ElementToClone) {}
-		static EbmlElement & Create() {return *(new KaxTagMultiCommentComments);}
-		const EbmlCallbacks & Generic() const {return ClassInfos;}
-		static const EbmlCallbacks ClassInfos;
-		operator const EbmlId &() const {return ClassInfos.GlobalId;}
-		EbmlElement * Clone() const {return new KaxTagMultiCommentComments(*this);}
-};
-
-class MATROSKA_DLL_API KaxTagMultiCommentLanguage : public EbmlString {
-	public:
-		KaxTagMultiCommentLanguage() {}
-		KaxTagMultiCommentLanguage(const KaxTagMultiCommentLanguage & ElementToClone) :EbmlString(ElementToClone) {}
-		static EbmlElement & Create() {return *(new KaxTagMultiCommentLanguage);}
-		const EbmlCallbacks & Generic() const {return ClassInfos;}
-		static const EbmlCallbacks ClassInfos;
-		operator const EbmlId &() const {return ClassInfos.GlobalId;}
-		EbmlElement * Clone() const {return new KaxTagMultiCommentLanguage(*this);}
-};
-
-class MATROSKA_DLL_API KaxTagMultiCommercial : public EbmlMaster {
-	public:
-		KaxTagMultiCommercial();
-		KaxTagMultiCommercial(const KaxTagMultiCommercial & ElementToClone) :EbmlMaster(ElementToClone) {}
-		static EbmlElement & Create() {return *(new KaxTagMultiCommercial);}
-		const EbmlCallbacks & Generic() const {return ClassInfos;}
-		static const EbmlCallbacks ClassInfos;
-		operator const EbmlId &() const {return ClassInfos.GlobalId;}
-		EbmlElement * Clone() const {return new KaxTagMultiCommercial(*this);}
-};
-
-class MATROSKA_DLL_API KaxTagCommercial : public EbmlMaster {
-	public:
-		KaxTagCommercial();
-		KaxTagCommercial(const KaxTagCommercial & ElementToClone) :EbmlMaster(ElementToClone) {}
-		static EbmlElement & Create() {return *(new KaxTagCommercial);}
-		const EbmlCallbacks & Generic() const {return ClassInfos;}
-		static const EbmlCallbacks ClassInfos;
-		operator const EbmlId &() const {return ClassInfos.GlobalId;}
-		EbmlElement * Clone() const {return new KaxTagCommercial(*this);}
-};
-
-class MATROSKA_DLL_API KaxTagMultiCommercialType : public EbmlUInteger {
-	public:
-		KaxTagMultiCommercialType() {}
-		KaxTagMultiCommercialType(const KaxTagMultiCommercialType & ElementToClone) :EbmlUInteger(ElementToClone) {}
-		static EbmlElement & Create() {return *(new KaxTagMultiCommercialType);}
-		const EbmlCallbacks & Generic() const {return ClassInfos;}
-		static const EbmlCallbacks ClassInfos;
-		operator const EbmlId &() const {return ClassInfos.GlobalId;}
-		EbmlElement * Clone() const {return new KaxTagMultiCommercialType(*this);}

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxChapters.cpp Deleted

@@ -1,118 +0,0 @@
-/****************************************************************************
-** 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: KaxChapters.cpp 1201 2005-08-30 14:28:27Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#include "matroska/KaxChapters.h"
-#include "matroska/KaxContexts.h"
-#include "matroska/KaxDefines.h"
-
-// sub elements
-START_LIBMATROSKA_NAMESPACE
-
-DEFINE_START_SEMANTIC(KaxChapters)
-DEFINE_SEMANTIC_ITEM(true, false, KaxEditionEntry)
-DEFINE_END_SEMANTIC(KaxChapters)
-
-DEFINE_START_SEMANTIC(KaxEditionEntry)
-DEFINE_SEMANTIC_ITEM(false, true, KaxEditionUID)
-DEFINE_SEMANTIC_ITEM(true, true, KaxEditionFlagHidden)
-DEFINE_SEMANTIC_ITEM(true, true, KaxEditionFlagDefault)
-DEFINE_SEMANTIC_ITEM(false, true, KaxEditionFlagOrdered)
-DEFINE_SEMANTIC_ITEM(true, false, KaxChapterAtom)
-DEFINE_END_SEMANTIC(KaxEditionEntry)
-
-DEFINE_START_SEMANTIC(KaxChapterAtom)
-DEFINE_SEMANTIC_ITEM(false, false, KaxChapterAtom)
-DEFINE_SEMANTIC_ITEM(true, true, KaxChapterUID)
-DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTimeStart)
-DEFINE_SEMANTIC_ITEM(false, true, KaxChapterTimeEnd)
-DEFINE_SEMANTIC_ITEM(true, true, KaxChapterFlagHidden)
-DEFINE_SEMANTIC_ITEM(true, true, KaxChapterFlagEnabled)
-DEFINE_SEMANTIC_ITEM(false, true, KaxChapterSegmentUID)
-DEFINE_SEMANTIC_ITEM(false, true, KaxChapterSegmentEditionUID)
-DEFINE_SEMANTIC_ITEM(false, true, KaxChapterPhysicalEquiv)
-DEFINE_SEMANTIC_ITEM(false, true, KaxChapterTrack)
-DEFINE_SEMANTIC_ITEM(false, false, KaxChapterDisplay)
-DEFINE_SEMANTIC_ITEM(false, false, KaxChapterProcess)
-DEFINE_END_SEMANTIC(KaxChapterAtom)
-
-DEFINE_START_SEMANTIC(KaxChapterTrack)
-DEFINE_SEMANTIC_ITEM(true, false, KaxChapterTrackNumber)
-DEFINE_END_SEMANTIC(KaxChapterTrack)
-
-DEFINE_START_SEMANTIC(KaxChapterDisplay)
-DEFINE_SEMANTIC_ITEM(true, true, KaxChapterString)
-DEFINE_SEMANTIC_ITEM(true, false, KaxChapterLanguage)
-DEFINE_SEMANTIC_ITEM(false, false, KaxChapterCountry)
-DEFINE_END_SEMANTIC(KaxChapterDisplay)
-
-DEFINE_START_SEMANTIC(KaxChapterProcess)
-DEFINE_SEMANTIC_ITEM(true, true, KaxChapterProcessCodecID)
-DEFINE_SEMANTIC_ITEM(false, true, KaxChapterProcessPrivate)
-DEFINE_SEMANTIC_ITEM(false, false, KaxChapterProcessCommand)
-DEFINE_END_SEMANTIC(KaxChapterProcess)
-
-DEFINE_START_SEMANTIC(KaxChapterProcessCommand)
-DEFINE_SEMANTIC_ITEM(true, true, KaxChapterProcessTime)
-DEFINE_SEMANTIC_ITEM(true, true, KaxChapterProcessData)
-DEFINE_END_SEMANTIC(KaxChapterProcessCommand)
-
-DEFINE_MKX_MASTER      (KaxChapters,             0x1043A770, 4, KaxSegment, "Chapters");
-DEFINE_MKX_MASTER      (KaxEditionEntry,             0x45B9, 2, KaxChapters, "EditionEntry");
-DEFINE_MKX_UINTEGER    (KaxEditionUID,               0x45BC, 2, KaxEditionEntry, "EditionUID");
-DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagHidden,        0x45BD, 2, KaxEditionEntry, "EditionFlagHidden", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagDefault,       0x45DB, 2, KaxEditionEntry, "EditionFlagDefault", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxEditionFlagOrdered,       0x45DD, 2, KaxEditionEntry, "EditionFlagOrdered", 0);
-DEFINE_MKX_MASTER      (KaxChapterAtom,                0xB6, 1, KaxEditionEntry, "ChapterAtom");
-DEFINE_MKX_UINTEGER    (KaxChapterUID,               0x73C4, 2, KaxChapterAtom, "ChapterUID");
-DEFINE_MKX_UINTEGER    (KaxChapterTimeStart,           0x91, 1, KaxChapterAtom, "ChapterTimeStart");
-DEFINE_MKX_UINTEGER    (KaxChapterTimeEnd,             0x92, 1, KaxChapterAtom, "ChapterTimeEnd");
-DEFINE_MKX_UINTEGER_DEF(KaxChapterFlagHidden,          0x98, 1, KaxChapterAtom, "ChapterFlagHidden", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxChapterFlagEnabled,       0x4598, 2, KaxChapterAtom, "ChapterFlagEnabled", 1);
-DEFINE_MKX_BINARY      (KaxChapterSegmentUID,        0x6E67, 2, KaxChapterAtom, "ChapterSegmentUID");
-DEFINE_MKX_BINARY      (KaxChapterSegmentEditionUID, 0x6EBC, 2, KaxChapterAtom, "ChapterSegmentEditionUID");
-DEFINE_MKX_UINTEGER    (KaxChapterPhysicalEquiv,     0x63C3, 2, KaxChapterAtom, "ChapterPhysicalEquiv");
-DEFINE_MKX_MASTER      (KaxChapterTrack,               0x8F, 1, KaxChapterAtom, "ChapterTrack");
-DEFINE_MKX_UINTEGER    (KaxChapterTrackNumber,         0x89, 1, KaxChapterTrack, "ChapterTrackNumber");
-DEFINE_MKX_MASTER      (KaxChapterDisplay,             0x80, 1, KaxChapterAtom, "ChapterDisplay");
-DEFINE_MKX_UNISTRING   (KaxChapterString,              0x85, 1, KaxChapterDisplay, "ChapterString");
-DEFINE_MKX_STRING_DEF  (KaxChapterLanguage,          0x437C, 2, KaxChapterLanguage, "ChapterLanguage", "eng"); // parent context ?
-DEFINE_MKX_STRING      (KaxChapterCountry,           0x437E, 2, KaxChapterCountry, "ChapterCountry"); // parent context ?
-DEFINE_MKX_MASTER      (KaxChapterProcess,           0x6944, 2, KaxChapterAtom, "ChapterProcess");
-DEFINE_MKX_UINTEGER_DEF(KaxChapterProcessCodecID,    0x6955, 2, KaxChapterProcess, "ChapterProcessCodecID", 0);
-DEFINE_MKX_BINARY      (KaxChapterProcessPrivate,    0x450D, 2, KaxChapterProcess, "ChapterProcessPrivate");
-DEFINE_MKX_MASTER      (KaxChapterProcessCommand,    0x6911, 2, KaxChapterProcess, "ChapterProcessCommand");
-DEFINE_MKX_UINTEGER    (KaxChapterProcessTime,       0x6922, 2, KaxChapterProcessCommand, "ChapterProcessTime");
-DEFINE_MKX_BINARY      (KaxChapterProcessData,       0x6933, 2, KaxChapterProcessCommand, "ChapterProcessData");
-
-END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxClusterData.cpp Deleted

@@ -1,51 +0,0 @@
-/****************************************************************************
-** 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: KaxClusterData.cpp 955 2004-11-28 15:24:37Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#include "matroska/KaxClusterData.h"
-#include "matroska/KaxContexts.h"
-#include "matroska/KaxDefines.h"
-
-START_LIBMATROSKA_NAMESPACE
-
-DEFINE_START_SEMANTIC(KaxClusterSilentTracks)
-DEFINE_SEMANTIC_ITEM(false, false, KaxClusterSilentTrackNumber)
-DEFINE_END_SEMANTIC(KaxClusterSilentTracks)
-
-DEFINE_MKX_UINTEGER(KaxClusterTimecode,            0xE7, 1, KaxCluster, "ClusterTimecode");
-DEFINE_MKX_MASTER  (KaxClusterSilentTracks,      0x5854, 2, KaxCluster, "ClusterSilentTracks")
-DEFINE_MKX_UINTEGER(KaxClusterSilentTrackNumber, 0x58D7, 2, KaxClusterSilentTracks, "ClusterSilentTrackNumber");
-DEFINE_MKX_UINTEGER(KaxClusterPosition,            0xA7, 1, KaxCluster, "ClusterPosition");
-DEFINE_MKX_UINTEGER(KaxClusterPrevSize,            0xAB, 1, KaxCluster, "ClusterPrevSize");
-
-END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxContentEncoding.cpp Deleted

@@ -1,83 +0,0 @@
-/****************************************************************************
-** 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: KaxContentEncoding.cpp 640 2004-07-09 21:05:36Z mosu $
-	\author Moritz Bunkus <moritz @ bunkus.org>
-*/
-#include "matroska/KaxContentEncoding.h"
-#include "matroska/KaxContexts.h"
-#include "matroska/KaxDefines.h"
-
-START_LIBMATROSKA_NAMESPACE
-
-DEFINE_START_SEMANTIC(KaxContentEncodings)
-DEFINE_SEMANTIC_ITEM(true, true, KaxContentEncoding)
-DEFINE_END_SEMANTIC(KaxContentEncodings)
-
-DEFINE_START_SEMANTIC(KaxContentEncoding)
-DEFINE_SEMANTIC_ITEM(true, true, KaxContentEncodingOrder)
-DEFINE_SEMANTIC_ITEM(true, true, KaxContentEncodingScope)
-DEFINE_SEMANTIC_ITEM(true, true, KaxContentEncodingType)
-DEFINE_SEMANTIC_ITEM(false, true, KaxContentCompression)
-DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncryption)
-DEFINE_END_SEMANTIC(KaxContentEncoding)
-
-DEFINE_START_SEMANTIC(KaxContentCompression)
-DEFINE_SEMANTIC_ITEM(true, true, KaxContentCompAlgo)
-DEFINE_SEMANTIC_ITEM(false, true, KaxContentCompSettings)
-DEFINE_END_SEMANTIC(KaxContentCompression)
-
-DEFINE_START_SEMANTIC(KaxContentEncryption)
-DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncAlgo)
-DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncKeyID)
-DEFINE_SEMANTIC_ITEM(false, true, KaxContentSignature)
-DEFINE_SEMANTIC_ITEM(false, true, KaxContentSigKeyID)
-DEFINE_SEMANTIC_ITEM(false, true, KaxContentSigAlgo)
-DEFINE_SEMANTIC_ITEM(false, true, KaxContentSigHashAlgo)
-DEFINE_END_SEMANTIC(KaxContentEncryption)
-
-DEFINE_MKX_MASTER      (KaxContentEncodings,     0x6d80, 2, KaxTrackEntry, "ContentEncodings");
-DEFINE_MKX_MASTER      (KaxContentEncoding,      0x6240, 2, KaxContentEncodings, "ContentEncoding");
-DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingOrder, 0x5031, 2, KaxContentEncoding, "ContentEncodingOrder", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingScope, 0x5032, 2, KaxContentEncoding, "ContentEncodingScope", 1);
-DEFINE_MKX_UINTEGER_DEF(KaxContentEncodingType,  0x5033, 2, KaxContentEncoding, "ContentEncodingType", 0);
-DEFINE_MKX_MASTER      (KaxContentCompression,   0x5034, 2, KaxContentEncoding, "ContentCompression");
-DEFINE_MKX_UINTEGER_DEF(KaxContentCompAlgo,      0x4254, 2, KaxContentCompression, "ContentCompAlgo", 0);
-DEFINE_MKX_BINARY      (KaxContentCompSettings,  0x4255, 2, KaxContentCompression, "ContentCompSettings");
-DEFINE_MKX_MASTER      (KaxContentEncryption,    0x5035, 2, KaxContentEncoding, "ContentEncryption");
-DEFINE_MKX_UINTEGER_DEF(KaxContentEncAlgo,       0x47e1, 2, KaxContentEncryption, "ContentEncAlgo", 0);
-DEFINE_MKX_BINARY      (KaxContentEncKeyID,      0x47e2, 2, KaxContentEncryption, "ContentEncKeyID");
-DEFINE_MKX_BINARY      (KaxContentSignature,     0x47e3, 2, KaxContentEncryption, "ContentSignature");
-DEFINE_MKX_BINARY      (KaxContentSigKeyID,      0x47e4, 2, KaxContentEncryption, "ContentSigKeyID");
-DEFINE_MKX_UINTEGER_DEF(KaxContentSigAlgo,       0x47e5, 2, KaxContentEncryption, "ContentSigAlgo", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxContentSigHashAlgo,   0x47e6, 2, KaxContentEncryption, "ContentSigHashAlgo", 0);
-
-END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxInfo.cpp Deleted

@@ -1,65 +0,0 @@
-/****************************************************************************
-** 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: KaxInfo.cpp 1078 2005-03-03 13:13:04Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#include "matroska/KaxInfo.h"
-#include "matroska/KaxInfoData.h"
-
-#include "matroska/KaxContexts.h"
-#include "matroska/KaxDefines.h"
-
-// sub elements
-START_LIBMATROSKA_NAMESPACE
-
-DEFINE_START_SEMANTIC(KaxInfo)
-DEFINE_SEMANTIC_ITEM(false, true, KaxSegmentUID)
-DEFINE_SEMANTIC_ITEM(false, true, KaxSegmentFilename)
-DEFINE_SEMANTIC_ITEM(false, true, KaxPrevUID)
-DEFINE_SEMANTIC_ITEM(false, true, KaxPrevFilename)
-DEFINE_SEMANTIC_ITEM(false, true, KaxNextUID)
-DEFINE_SEMANTIC_ITEM(false, true, KaxNextFilename)
-DEFINE_SEMANTIC_ITEM(false, false, KaxSegmentFamily)
-DEFINE_SEMANTIC_ITEM(false, false, KaxChapterTranslate)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTimecodeScale)
-DEFINE_SEMANTIC_ITEM(false, true, KaxDuration)
-DEFINE_SEMANTIC_ITEM(false, true, KaxDateUTC)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTitle)
-DEFINE_SEMANTIC_ITEM(true, true, KaxMuxingApp)
-DEFINE_SEMANTIC_ITEM(true, true, KaxWritingApp)
-DEFINE_END_SEMANTIC(KaxInfo)
-
-DEFINE_MKX_MASTER   (KaxInfo,   0x1549A966, 4, KaxSegment, "Info");
-DEFINE_MKX_UNISTRING(KaxMuxingApp,  0x4D80, 2, KaxInfo, "MuxingApp");
-DEFINE_MKX_UNISTRING(KaxWritingApp, 0x5741, 2, KaxInfo, "WritingApp");
-
-END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxTag.cpp Deleted

@@ -1,84 +0,0 @@
-/****************************************************************************
-** 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: KaxTag.cpp 1325 2009-03-30 07:56:54Z robux4 $
-	\author Jory Stone       <jcsston @ toughguy.net>
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#include "matroska/KaxTag.h"
-#include "matroska/KaxContexts.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-// sub elements
-START_LIBMATROSKA_NAMESPACE
-
-DEFINE_START_SEMANTIC(KaxTag)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTagTargets)
-DEFINE_SEMANTIC_ITEM(true, false, KaxTagSimple)
-DEFINE_END_SEMANTIC(KaxTag)
-
-DEFINE_START_SEMANTIC(KaxTagTargets)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTagTargetTypeValue)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTagTargetType)
-DEFINE_SEMANTIC_ITEM(false, false, KaxTagTrackUID)
-DEFINE_SEMANTIC_ITEM(false, false, KaxTagEditionUID)
-DEFINE_SEMANTIC_ITEM(false, false, KaxTagChapterUID)
-DEFINE_SEMANTIC_ITEM(false, false, KaxTagAttachmentUID)
-DEFINE_END_SEMANTIC(KaxTagTargets)
-
-DEFINE_START_SEMANTIC(KaxTagSimple)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTagName)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTagLangue)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTagDefault)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTagString)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTagBinary)
-DEFINE_SEMANTIC_ITEM(false, false, KaxTagSimple)
-DEFINE_END_SEMANTIC(KaxTagSimple)
-
-DEFINE_MKX_MASTER      (KaxTag,                       0x7373, 2, KaxTags, "Tag");
-DEFINE_MKX_MASTER      (KaxTagTargets,                0x63C0, 2, KaxTag, "TagTargets");
-DEFINE_MKX_UINTEGER_DEF(KaxTagTargetTypeValue,        0x68CA, 2, KaxTagTargets, "TagTargetTypeValue", 50);
-DEFINE_MKX_STRING      (KaxTagTargetType,             0x63CA, 2, KaxTagTargets, "TagTargetType");
-DEFINE_MKX_UINTEGER_DEF(KaxTagTrackUID,               0x63C5, 2, KaxTagTargets, "TagTrackUID", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxTagEditionUID,             0x63C9, 2, KaxTagTargets, "TagEditionUID", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxTagChapterUID,             0x63C4, 2, KaxTagTargets, "TagChapterUID", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxTagAttachmentUID,          0x63C6, 2, KaxTagTargets, "TagAttachmentUID", 0);
-
-DEFINE_MKX_MASTER      (KaxTagSimple,                 0x67C8, 2, KaxTag, "TagSimple");
-DEFINE_MKX_UNISTRING   (KaxTagName,                   0x45A3, 2, KaxTagSimple, "TagName");
-DEFINE_MKX_STRING_DEF  (KaxTagLangue,                 0x447A, 2, KaxTagSimple, "TagLanguage", "und");
-DEFINE_MKX_UINTEGER_DEF(KaxTagDefault,                0x4484, 2, KaxTagSimple, "TagDefault", 1);
-DEFINE_MKX_UNISTRING   (KaxTagString,                 0x4487, 2, KaxTagSimple, "TagString");
-DEFINE_MKX_BINARY      (KaxTagBinary,                 0x4485, 2, KaxTagSimple, "TagBinary");
-
-END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxTagMulti.cpp Deleted

@@ -1,404 +0,0 @@
-/****************************************************************************
-** libmatroska : parse Matroska files, see http://www.matroska.org/
-**
-** <file/class description>
-**
-** Copyright (C) 2002-2004 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: KaxTagMulti.cpp 640 2004-07-09 21:05:36Z mosu $
-	\author Jory Stone       <jcsston @ toughguy.net>
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#include "matroska/KaxTagMulti.h"
-#include "matroska/KaxContexts.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-EbmlSemantic KaxTagMultiGlobal_ContextList[1] =
-{
-	EbmlSemantic(false, false, KaxTagMultiComment::ClassInfos),
-};
-
-EbmlSemantic KaxTagMultiComment_ContextList[3] =
-{
-	EbmlSemantic(false, true, KaxTagMultiCommentName::ClassInfos),
-	EbmlSemantic(false, true, KaxTagMultiCommentComments::ClassInfos),
-	EbmlSemantic(false, true, KaxTagMultiCommentLanguage::ClassInfos),
-};
-
-EbmlSemantic KaxTagMultiCommercial_ContextList[1] =
-{
-	EbmlSemantic(true, false, KaxTagCommercial::ClassInfos),
-};
-
-EbmlSemantic KaxTagCommercial_ContextList[5] =
-{
-	EbmlSemantic(true,  true,  KaxTagMultiCommercialType::ClassInfos),
-	EbmlSemantic(false, true,  KaxTagMultiCommercialAddress::ClassInfos),
-	EbmlSemantic(false, false, KaxTagMultiCommercialURL::ClassInfos),
-	EbmlSemantic(false, false, KaxTagMultiCommercialEmail::ClassInfos),
-	EbmlSemantic(false, false, KaxTagMultiPrice::ClassInfos),
-};
-
-EbmlSemantic KaxTagMultiPrice_ContextList[3] =
-{
-	EbmlSemantic(false, true, KaxTagMultiPriceCurrency::ClassInfos),
-	EbmlSemantic(false, true, KaxTagMultiPriceAmount::ClassInfos),
-	EbmlSemantic(false, true, KaxTagMultiPricePriceDate::ClassInfos),
-};
-
-EbmlSemantic KaxTagMultiDate_ContextList[1] =
-{
-	EbmlSemantic(true, false, KaxTagDate::ClassInfos),
-};
-
-EbmlSemantic KaxTagDate_ContextList[3] =
-{
-	EbmlSemantic(true,  true, KaxTagMultiDateType::ClassInfos),
-	EbmlSemantic(false, true, KaxTagMultiDateDateBegin::ClassInfos),
-	EbmlSemantic(false, true, KaxTagMultiDateDateEnd::ClassInfos),
-};
-
-EbmlSemantic KaxTagMultiEntity_ContextList[1] =
-{
-	EbmlSemantic(true, false, KaxTagEntity::ClassInfos),
-};
-
-EbmlSemantic KaxTagEntity_ContextList[5] =
-{
-	EbmlSemantic(true,  true,  KaxTagMultiEntityType::ClassInfos),
-	EbmlSemantic(false, true,  KaxTagMultiEntityName::ClassInfos),
-	EbmlSemantic(false, false, KaxTagMultiEntityURL::ClassInfos),
-	EbmlSemantic(false, false, KaxTagMultiEntityEmail::ClassInfos),
-	EbmlSemantic(false, true,  KaxTagMultiEntityAddress::ClassInfos),
-};
-
-EbmlSemantic KaxTagMultiIdentifier_ContextList[1] =
-{
-	EbmlSemantic(true, false, KaxTagIdentifier::ClassInfos),
-};
-
-EbmlSemantic KaxTagIdentifier_ContextList[3] =
-{
-	EbmlSemantic(true,  true, KaxTagMultiIdentifierType::ClassInfos),
-	EbmlSemantic(false, true, KaxTagMultiIdentifierBinary::ClassInfos),
-	EbmlSemantic(false, true, KaxTagMultiIdentifierString::ClassInfos),
-};
-
-EbmlSemantic KaxTagMultiLegal_ContextList[1] =
-{
-	EbmlSemantic(true, false, KaxTagLegal::ClassInfos),
-};
-
-EbmlSemantic KaxTagLegal_ContextList[4] =
-{
-	EbmlSemantic(true,  true,  KaxTagMultiLegalType::ClassInfos),
-	EbmlSemantic(false, true,  KaxTagMultiLegalContent::ClassInfos),
-	EbmlSemantic(false, false, KaxTagMultiLegalURL::ClassInfos),
-	EbmlSemantic(false, true,  KaxTagMultiLegalAddress::ClassInfos),
-};
-
-EbmlSemantic KaxTagMultiTitle_ContextList[1] =
-{
-	EbmlSemantic(true, false, KaxTagTitle::ClassInfos),
-};
-
-EbmlSemantic KaxTagTitle_ContextList[8] =
-{
-	EbmlSemantic(true,  true,  KaxTagMultiTitleType::ClassInfos),
-	EbmlSemantic(false, true,  KaxTagMultiTitleName::ClassInfos),
-	EbmlSemantic(false, true,  KaxTagMultiTitleSubTitle::ClassInfos),
-	EbmlSemantic(false, true,  KaxTagMultiTitleEdition::ClassInfos),
-	EbmlSemantic(false, true,  KaxTagMultiTitleAddress::ClassInfos),
-	EbmlSemantic(false, false, KaxTagMultiTitleURL::ClassInfos),
-	EbmlSemantic(false, false, KaxTagMultiTitleEmail::ClassInfos),
-	EbmlSemantic(false, true,  KaxTagMultiTitleLanguage::ClassInfos),
-};
-
-EbmlSemantic KaxTagMultiAttachment_ContextList[1] =
-{
-	EbmlSemantic(true, false, KaxTagAttachment::ClassInfos),
-};
-
-EbmlSemantic KaxTagAttachment_ContextList[1] =
-{
-	EbmlSemantic(false, true,  KaxTagAttachmentID::ClassInfos),
-};
-
-const EbmlSemanticContext KaxTagMultiGlobal_Context = EbmlSemanticContext(countof(KaxTagMultiGlobal_ContextList), KaxTagMultiGlobal_ContextList, NULL, *GetKaxGlobal_Context, NULL);
-
-const EbmlSemanticContext KaxTagMultiComment_Context = EbmlSemanticContext(countof(KaxTagMultiComment_ContextList), KaxTagMultiComment_ContextList, &KaxTag_Context, *GetKaxGlobal_Context, &KaxTagMultiComment::ClassInfos);
-const EbmlSemanticContext KaxTagMultiCommentName_Context = EbmlSemanticContext(0, NULL, &KaxTagMultiComment_Context, *GetKaxGlobal_Context, &KaxTagMultiCommentName::ClassInfos);
-const EbmlSemanticContext KaxTagMultiCommentComments_Context = EbmlSemanticContext(0, NULL, &KaxTagMultiComment_Context, *GetKaxGlobal_Context, &KaxTagMultiCommentComments::ClassInfos);
-const EbmlSemanticContext KaxTagMultiCommentLanguage_Context = EbmlSemanticContext(0, NULL, &KaxTagMultiComment_Context, *GetKaxGlobal_Context, &KaxTagMultiCommentLanguage::ClassInfos);
-
-const EbmlSemanticContext KaxTagMultiCommercial_Context = EbmlSemanticContext(countof(KaxTagMultiCommercial_ContextList), KaxTagMultiCommercial_ContextList, &KaxTag_Context, *GetKaxTagsGlobal_Context, &KaxTagMultiCommercial::ClassInfos);
-const EbmlSemanticContext KaxTagCommercial_Context = EbmlSemanticContext(countof(KaxTagCommercial_ContextList), KaxTagCommercial_ContextList, &KaxTagMultiCommercial_Context, *GetKaxTagsGlobal_Context, &KaxTagCommercial::ClassInfos);
-const EbmlSemanticContext KaxTagMultiCommercialType_Context = EbmlSemanticContext(0, NULL, &KaxTagCommercial_Context, *GetKaxGlobal_Context, &KaxTagMultiCommercialType::ClassInfos);
-const EbmlSemanticContext KaxTagMultiCommercialAddress_Context = EbmlSemanticContext(0, NULL, &KaxTagCommercial_Context, *GetKaxGlobal_Context, &KaxTagMultiCommercialAddress::ClassInfos);
-const EbmlSemanticContext KaxTagMultiCommercialURL_Context = EbmlSemanticContext(0, NULL, &KaxTagCommercial_Context, *GetKaxGlobal_Context, &KaxTagMultiCommercialURL::ClassInfos);
-const EbmlSemanticContext KaxTagMultiCommercialEmail_Context = EbmlSemanticContext(0, NULL, &KaxTagCommercial_Context, *GetKaxGlobal_Context, &KaxTagMultiCommercialEmail::ClassInfos);
-
-const EbmlSemanticContext KaxTagMultiPrice_Context = EbmlSemanticContext(countof(KaxTagMultiPrice_ContextList), KaxTagMultiPrice_ContextList, &KaxTagCommercial_Context, *GetKaxTagsGlobal_Context, &KaxTagMultiPrice::ClassInfos);
-const EbmlSemanticContext KaxTagMultiPriceCurrency_Context = EbmlSemanticContext(0, NULL, &KaxTagMultiPrice_Context, *GetKaxGlobal_Context, &KaxTagMultiPriceCurrency::ClassInfos);
-const EbmlSemanticContext KaxTagMultiPriceAmount_Context = EbmlSemanticContext(0, NULL, &KaxTagMultiPrice_Context, *GetKaxGlobal_Context, &KaxTagMultiPriceAmount::ClassInfos);
-const EbmlSemanticContext KaxTagMultiPricePriceDate_Context = EbmlSemanticContext(0, NULL, &KaxTagMultiPrice_Context, *GetKaxGlobal_Context, &KaxTagMultiPricePriceDate::ClassInfos);
-
-const EbmlSemanticContext KaxTagMultiDate_Context = EbmlSemanticContext(countof(KaxTagMultiDate_ContextList), KaxTagMultiDate_ContextList, &KaxTag_Context, *GetKaxTagsGlobal_Context, &KaxTagMultiDate::ClassInfos);
-const EbmlSemanticContext KaxTagDate_Context = EbmlSemanticContext(countof(KaxTagDate_ContextList), KaxTagDate_ContextList, &KaxTagMultiDate_Context, *GetKaxTagsGlobal_Context, &KaxTagDate::ClassInfos);
-const EbmlSemanticContext KaxTagMultiDateType_Context = EbmlSemanticContext(0, NULL, &KaxTagDate_Context, *GetKaxGlobal_Context, &KaxTagMultiDateType::ClassInfos);
-const EbmlSemanticContext KaxTagMultiDateDateBegin_Context = EbmlSemanticContext(0, NULL, &KaxTagDate_Context, *GetKaxGlobal_Context, &KaxTagMultiDateDateBegin::ClassInfos);
-const EbmlSemanticContext KaxTagMultiDateDateEnd_Context = EbmlSemanticContext(0, NULL, &KaxTagDate_Context, *GetKaxGlobal_Context, &KaxTagMultiDateDateEnd::ClassInfos);
-
-const EbmlSemanticContext KaxTagMultiEntity_Context = EbmlSemanticContext(countof(KaxTagMultiEntity_ContextList), KaxTagMultiEntity_ContextList, &KaxTag_Context, *GetKaxTagsGlobal_Context, &KaxTagMultiEntity::ClassInfos);
-const EbmlSemanticContext KaxTagEntity_Context = EbmlSemanticContext(countof(KaxTagEntity_ContextList), KaxTagEntity_ContextList, &KaxTagMultiEntity_Context, *GetKaxTagsGlobal_Context, &KaxTagEntity::ClassInfos);
-const EbmlSemanticContext KaxTagMultiEntityType_Context = EbmlSemanticContext(0, NULL, &KaxTagEntity_Context, *GetKaxGlobal_Context, &KaxTagMultiEntityType::ClassInfos);
-const EbmlSemanticContext KaxTagMultiEntityName_Context = EbmlSemanticContext(0, NULL, &KaxTagEntity_Context, *GetKaxGlobal_Context, &KaxTagMultiEntityName::ClassInfos);
-const EbmlSemanticContext KaxTagMultiEntityURL_Context = EbmlSemanticContext(0, NULL, &KaxTagEntity_Context, *GetKaxGlobal_Context, &KaxTagMultiEntityURL::ClassInfos);
-const EbmlSemanticContext KaxTagMultiEntityEmail_Context = EbmlSemanticContext(0, NULL, &KaxTagEntity_Context, *GetKaxGlobal_Context, &KaxTagMultiEntityEmail::ClassInfos);
-const EbmlSemanticContext KaxTagMultiEntityAddress_Context = EbmlSemanticContext(0, NULL, &KaxTagEntity_Context, *GetKaxGlobal_Context, &KaxTagMultiEntityAddress::ClassInfos);
-
-const EbmlSemanticContext KaxTagMultiIdentifier_Context = EbmlSemanticContext(countof(KaxTagMultiIdentifier_ContextList), KaxTagMultiIdentifier_ContextList, &KaxTag_Context, *GetKaxTagsGlobal_Context, &KaxTagMultiIdentifier::ClassInfos);
-const EbmlSemanticContext KaxTagIdentifier_Context = EbmlSemanticContext(countof(KaxTagIdentifier_ContextList), KaxTagIdentifier_ContextList, &KaxTagMultiIdentifier_Context, *GetKaxTagsGlobal_Context, &KaxTagIdentifier::ClassInfos);
-const EbmlSemanticContext KaxTagMultiIdentifierType_Context = EbmlSemanticContext(0, NULL, &KaxTagIdentifier_Context, *GetKaxGlobal_Context, &KaxTagMultiIdentifierType::ClassInfos);
-const EbmlSemanticContext KaxTagMultiIdentifierBinary_Context = EbmlSemanticContext(0, NULL, &KaxTagIdentifier_Context, *GetKaxGlobal_Context, &KaxTagMultiIdentifierBinary::ClassInfos);
-const EbmlSemanticContext KaxTagMultiIdentifierString_Context = EbmlSemanticContext(0, NULL, &KaxTagIdentifier_Context, *GetKaxGlobal_Context, &KaxTagMultiIdentifierString::ClassInfos);
-
-const EbmlSemanticContext KaxTagMultiLegal_Context = EbmlSemanticContext(countof(KaxTagMultiLegal_ContextList), KaxTagMultiLegal_ContextList, &KaxTag_Context, *GetKaxTagsGlobal_Context, &KaxTagMultiLegal::ClassInfos);
-const EbmlSemanticContext KaxTagLegal_Context = EbmlSemanticContext(countof(KaxTagLegal_ContextList), KaxTagLegal_ContextList, &KaxTagMultiLegal_Context, *GetKaxTagsGlobal_Context, &KaxTagLegal::ClassInfos);
-const EbmlSemanticContext KaxTagMultiLegalType_Context = EbmlSemanticContext(0, NULL, &KaxTagLegal_Context, *GetKaxGlobal_Context, &KaxTagMultiLegalType::ClassInfos);
-const EbmlSemanticContext KaxTagMultiLegalContent_Context = EbmlSemanticContext(0, NULL, &KaxTagLegal_Context, *GetKaxGlobal_Context, &KaxTagMultiLegalContent::ClassInfos);
-const EbmlSemanticContext KaxTagMultiLegalURL_Context = EbmlSemanticContext(0, NULL, &KaxTagLegal_Context, *GetKaxGlobal_Context, &KaxTagMultiLegalURL::ClassInfos);
-const EbmlSemanticContext KaxTagMultiLegalAddress_Context = EbmlSemanticContext(0, NULL, &KaxTagLegal_Context, *GetKaxGlobal_Context, &KaxTagMultiLegalAddress::ClassInfos);
-

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxTags.cpp Deleted

@@ -1,52 +0,0 @@
-/****************************************************************************
-** 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: KaxTags.cpp 711 2004-08-10 12:58:47Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Jory Stone       <jcsston @ toughguy.net>
-*/
-#include "matroska/KaxTags.h"
-#include "matroska/KaxTag.h"
-#include "matroska/KaxContexts.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-// sub elements
-START_LIBMATROSKA_NAMESPACE
-
-DEFINE_START_SEMANTIC(KaxTags)
-DEFINE_SEMANTIC_ITEM(true, false, KaxTag)
-DEFINE_END_SEMANTIC(KaxTags)
-
-DEFINE_MKX_MASTER(KaxTags, 0x1254C367, 4, KaxSegment, "Tags");
-
-END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxTrackAudio.cpp Deleted

@@ -1,62 +0,0 @@
-/****************************************************************************
-** 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: KaxTrackAudio.cpp 640 2004-07-09 21:05:36Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#include "matroska/KaxTrackAudio.h"
-
-// sub elements
-#include "matroska/KaxContexts.h"
-#include "matroska/KaxDefines.h"
-
-START_LIBMATROSKA_NAMESPACE
-
-DEFINE_START_SEMANTIC(KaxTrackAudio)
-DEFINE_SEMANTIC_ITEM(true, true, KaxAudioSamplingFreq)
-DEFINE_SEMANTIC_ITEM(true, true, KaxAudioChannels)
-DEFINE_SEMANTIC_ITEM(false, true, KaxAudioBitDepth)
-DEFINE_SEMANTIC_ITEM(false, true, KaxAudioOutputSamplingFreq)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxAudioPosition)
-#endif // MATROSKA_VERSION
-DEFINE_END_SEMANTIC(KaxTrackAudio)
-
-DEFINE_MKX_MASTER      (KaxTrackAudio,                0xE1, 1, KaxTrackEntry, "TrackAudio");
-DEFINE_MKX_FLOAT_DEF   (KaxAudioSamplingFreq,         0xB5, 1, KaxTrackAudio, "AudioSamplingFreq", 8000.0);
-DEFINE_MKX_FLOAT       (KaxAudioOutputSamplingFreq, 0x78B5, 2, KaxTrackAudio, "AudioOutputSamplingFreq");
-DEFINE_MKX_UINTEGER_DEF(KaxAudioChannels,             0x9F, 1, KaxTrackAudio, "AudioChannels", 1);
-DEFINE_MKX_UINTEGER    (KaxAudioBitDepth,           0x6264, 2, KaxTrackAudio, "AudioBitDepth");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_BINARY      (KaxAudioPosition,           0x7D7B, 2, KaxTrackAudio, "AudioPosition");
-#endif
-
-END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxTrackEntryData.cpp Deleted

@@ -1,79 +0,0 @@
-/****************************************************************************
-** 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: KaxTrackEntryData.cpp 1201 2005-08-30 14:28:27Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author John Cannon      <spyder2555 @ users.sf.net>
-*/
-#include "matroska/KaxTrackEntryData.h"
-#include "matroska/KaxContexts.h"
-#include "matroska/KaxDefines.h"
-
-START_LIBMATROSKA_NAMESPACE
-
-DEFINE_START_SEMANTIC(KaxTrackTranslate)
-DEFINE_SEMANTIC_ITEM(false, false, KaxTrackTranslateEditionUID)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackTranslateCodec)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackTranslateTrackID)
-DEFINE_END_SEMANTIC(KaxTrackTranslate)
-
-DEFINE_MKX_UINTEGER    (KaxTrackNumber,                0xD7, 1, KaxTracks, "TrackNumber");
-DEFINE_MKX_UINTEGER    (KaxTrackUID,                 0x73C5, 2, KaxTracks, "TrackUID");
-DEFINE_MKX_UINTEGER    (KaxTrackType,                  0x83, 1, KaxTracks, "TrackType");
-DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagDefault,           0x88, 1, KaxTracks, "TrackFlagEnabled", 1);
-DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagForced,          0x55AA, 2, KaxTracks, "TrackFlagForced", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagLacing,            0x9C, 1, KaxTracks, "TrackFlagLacing", 1);
-DEFINE_MKX_UINTEGER_DEF(KaxTrackMinCache,            0x6DE7, 2, KaxTracks, "TrackMinCache", 0);
-DEFINE_MKX_UINTEGER    (KaxTrackMaxCache,            0x6DF8, 2, KaxTracks, "TrackMaxCache\0rotomodobopo");
-DEFINE_MKX_UINTEGER    (KaxTrackDefaultDuration,   0x23E383, 3, KaxTracks, "TrackDefaultDuration");
-DEFINE_MKX_FLOAT_DEF   (KaxTrackTimecodeScale,     0x23314F, 3, KaxTracks, "TrackTimecodeScale", 1.0);
-DEFINE_MKX_UINTEGER_DEF(KaxMaxBlockAdditionID,       0x55EE, 2, KaxTracks, "MaxBlockAdditionID", 0);
-//DEFINE_MKX_SINTEGER_DEF(KaxTrackOffset,            0x537F, 2, KaxTracks, "TrackOffset", 0);
-DEFINE_MKX_UNISTRING   (KaxTrackName,                0x536E, 2, KaxTracks, "TrackName");
-DEFINE_MKX_STRING_DEF  (KaxTrackLanguage,          0x22B59C, 3, KaxTracks, "TrackLanguage", "eng");
-DEFINE_MKX_STRING      (KaxCodecID,                    0x86, 1, KaxTracks, "CodecID");
-DEFINE_MKX_BINARY      (KaxCodecPrivate,             0x63A2, 2, KaxTracks, "CodecPrivate");
-DEFINE_MKX_UNISTRING   (KaxCodecName,              0x258688, 3, KaxTracks, "CodecName");
-DEFINE_MKX_BINARY      (KaxTrackAttachmentLink,      0x7446, 2, KaxTracks, "TrackAttachmentLink");
-DEFINE_MKX_UINTEGER    (KaxTrackOverlay,             0x6FAB, 2, KaxTracks, "TrackOverlay");
-DEFINE_MKX_MASTER      (KaxTrackTranslate,           0x6624, 2, KaxTracks, "TrackTranslate");
-DEFINE_MKX_UINTEGER    (KaxTrackTranslateEditionUID, 0x66FC, 2, KaxTrackTranslate, "TrackTranslateEditionUID");
-DEFINE_MKX_UINTEGER    (KaxTrackTranslateCodec,      0x66BF, 2, KaxTrackTranslate, "TrackTranslateCodec");
-DEFINE_MKX_BINARY      (KaxTrackTranslateTrackID,    0x66A5, 2, KaxTrackTranslate, "TrackTranslateTrackID");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER_DEF(KaxTrackFlagEnabled,           0xB9, 1, KaxTracks, "TrackFlagDefault", 1);
-DEFINE_MKX_UNISTRING   (KaxCodecSettings,          0x3A9697, 3, KaxTracks, "CodecSettings");
-DEFINE_MKX_STRING      (KaxCodecInfoURL,           0x3B4040, 3, KaxTracks, "CodecInfoURL");
-DEFINE_MKX_STRING      (KaxCodecDownloadURL,       0x26B240, 3, KaxTracks, "CodecDownloadURL");
-DEFINE_MKX_UINTEGER_DEF(KaxCodecDecodeAll,             0xAA, 1, KaxTracks, "CodecDecodeAll", 1);
-#endif
-
-END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxTrackVideo.cpp Deleted

@@ -1,88 +0,0 @@
-/****************************************************************************
-** 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: KaxTrackVideo.cpp 738 2004-08-30 09:21:46Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-*/
-#include "matroska/KaxTrackVideo.h"
-
-// sub elements
-#include "matroska/KaxContexts.h"
-#include "matroska/KaxDefines.h"
-
-START_LIBMATROSKA_NAMESPACE
-
-DEFINE_START_SEMANTIC(KaxTrackVideo)
-DEFINE_SEMANTIC_ITEM(true, true, KaxVideoPixelWidth)
-DEFINE_SEMANTIC_ITEM(true, true, KaxVideoPixelHeight)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoPixelCropBottom)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoPixelCropTop)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoPixelCropLeft)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoPixelCropRight)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoDisplayWidth)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoDisplayHeight)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoColourSpace)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoFrameRate)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(true, true, KaxVideoFlagInterlaced)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoStereoMode)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoDisplayUnit)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoAspectRatio)
-DEFINE_SEMANTIC_ITEM(false, true, KaxVideoGamma)
-#endif // MATROSKA_VERSION
-DEFINE_END_SEMANTIC(KaxTrackVideo)
-
-DEFINE_MKX_MASTER      (KaxTrackVideo,             0xE0, 1, KaxTrackEntry, "TrackVideo");
-DEFINE_MKX_UINTEGER    (KaxVideoPixelWidth,        0xB0, 1, KaxTrackVideo, "VideoPixelWidth");
-DEFINE_MKX_UINTEGER    (KaxVideoPixelHeight,       0xBA, 1, KaxTrackVideo, "VideoPixelHeight");
-DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropBottom, 0x54AA, 2, KaxTrackVideo, "VideoPixelCropBottom", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropTop,    0x54BB, 2, KaxTrackVideo, "VideoPixelCropTop", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropLeft,   0x54CC, 2, KaxTrackVideo, "VideoPixelCropLeft", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoPixelCropRight,  0x54DD, 2, KaxTrackVideo, "VideoPixelCropRight", 0);
-DEFINE_MKX_UINTEGER    (KaxVideoDisplayWidth,    0x54B0, 2, KaxTrackVideo, "VideoDisplayWidth");
-DEFINE_MKX_UINTEGER    (KaxVideoDisplayHeight,   0x54BA, 2, KaxTrackVideo, "VideoDisplayHeight");
-DEFINE_MKX_BINARY      (KaxVideoColourSpace,   0x2EB524, 3, KaxTrackVideo, "VideoColourSpace");
-DEFINE_MKX_FLOAT       (KaxVideoFrameRate,     0x2383E3, 3, KaxTrackVideo, "VideoFrameRate");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER_DEF(KaxVideoFlagInterlaced,    0x9A, 1, KaxTrackVideo, "VideoFlagInterlaced", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoStereoMode,      0x53B8, 2, KaxTrackVideo, "VideoStereoMode", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoDisplayUnit,     0x54B2, 2, KaxTrackVideo, "VideoDisplayUnit", 0);
-DEFINE_MKX_UINTEGER_DEF(KaxVideoAspectRatio,     0x54B3, 2, KaxTrackVideo, "VideoAspectRatio", 0);
-DEFINE_MKX_FLOAT       (KaxVideoGamma,         0x2FB523, 3, KaxTrackVideo, "VideoGamma");
-#endif
-
-filepos_t KaxVideoFrameRate::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault)
-{
-	assert(false); // no you are not allowed to use this element !
-	return 0;
-}
-
-END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/makefile.linux Deleted

@@ -1,87 +0,0 @@
-
-include makefile.common
-
-GCC=gcc
-MOC=$(strip $(shell which moc-qt4))
-ifeq ($(MOC),)
-MOC=moc
-endif
-
-CXXOPTS=-Os -D_GNU_SOURCE -D_linux_
-
-BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine)
-BUILDINFO_BUILD_DATE=$(shell date)
-DESTDIR=
-PREFIX=/usr
-LIBDIR=${PREFIX}/lib
-
-
-all: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv out/libmmbd.so.0
-	@echo "type \"sudo make -f makefile.linux install\" to install"
-
-clean:
-	-rm -rf out tmp
-
-install: out/libdriveio.so.0 out/libmakemkv.so.1 out/makemkv out/libmmbd.so.0
-	install -D -m 644 out/libdriveio.so.0 $(DESTDIR)$(LIBDIR)/libdriveio.so.0
-	install -D -m 644 out/libmakemkv.so.1 $(DESTDIR)$(LIBDIR)/libmakemkv.so.1
-	install -D -m 644 out/libmmbd.so.0 $(DESTDIR)$(LIBDIR)/libmmbd.so.0
-ifndef DESTDIR
-	ldconfig
-endif
-	install -D -m 755 out/makemkv $(DESTDIR)$(PREFIX)/bin/makemkv
-	install -D -m 644 makemkvgui/share/makemkv.desktop $(DESTDIR)$(PREFIX)/share/applications/makemkv.desktop
-	install -D -m 644 makemkvgui/share/icons/16x16/makemkv.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/makemkv.png
-	install -D -m 644 makemkvgui/share/icons/22x22/makemkv.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/makemkv.png
-	install -D -m 644 makemkvgui/share/icons/32x32/makemkv.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/makemkv.png
-	install -D -m 644 makemkvgui/share/icons/64x64/makemkv.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/makemkv.png
-	install -D -m 644 makemkvgui/share/icons/128x128/makemkv.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png
-
-out/%: out/%.full
-	objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
-
-out/libdriveio.so.0.full:
-	mkdir -p out
-	$(GCC) $(CXXOPTS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBDRIVEIO_INC) $(LIBDRIVEIO_SRC) \
-	-fPIC -Xlinker -dy -Xlinker --version-script=libdriveio/src/libdriveio.vers \
-	-Xlinker -soname=libdriveio.so.0 -lc -lstdc++
-
-out/libmakemkv.so.1.full: tmp/gen_buildinfo.h
-	mkdir -p out
-	$(GCC) $(CXXOPTS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBEBML_DEF) $(LIBMATROSKA_INC) \
-	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFABI_INC) \
-	$(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \
-	$(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFABI_SRC) \
-	-DHAVE_BUILDINFO_H -Itmp \
-	-fPIC -Xlinker -dy -Xlinker --version-script=libmakemkv/src/libmakemkv.vers \
-	-Xlinker -soname=libmakemkv.so.1 -lc -lstdc++ -lcrypto -lz -lexpat -lavcodec -lavutil -lm
-
-out/libmmbd.so.0.full:
-	mkdir -p out
-	$(GCC) $(CXXOPTS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(MAKEMKVGUI_INC) $(LIBMMBD_INC) \
-	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBABI_INC) $(LIBMMBD_SRC) $(LIBMMBD_SRC_LINUX) $(SSTRING_SRC) \
-	-fPIC -Xlinker -dy -Xlinker --version-script=libmmbd/src/libmmbd.vers \
-	-Xlinker -soname=libmmbd.so.0 -lc -lstdc++ -lrt -lpthread -lcrypto
-
-out/makemkv.full: $(MAKEMKVGUI_GEN) $(MAKEMKVGUI_SRC_LINUX) tmp/gen_buildinfo.h
-	mkdir -p out
-	$(GCC) $(CXXOPTS) -o$@ $(MAKEMKVGUI_INC) $(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBDRIVEIO_INC) $(LIBABI_INC) \
-	$(MAKEMKVGUI_SRC) $(MAKEMKVGUI_SRC_LINUX) $(MAKEMKVGUI_GEN) $(SSTRING_SRC) $(LIBDRIVEIO_SRC_PUB) \
-	-DHAVE_BUILDINFO_H -Itmp \
-	-I/usr/include/qt4 -I/usr/lib/qt4/include -L/usr/lib/qt4 -L/usr/lib/qt4/lib -lc -lstdc++ \
-	-lQtGui -lQtCore -lQtDBus -lpthread -lz -lrt
-
-tmp/gen_buildinfo.h:
-	mkdir -p tmp
-	echo "#define BUILDINFO_ARCH_NAME \"$(BUILDINFO_ARCH_NAME)\"" >> $@
-	echo "#define BUILDINFO_BUILD_DATE \"$(BUILDINFO_BUILD_DATE)\"" >> $@
-
-tmp/moc_%.cpp : makemkvgui/src/%.h
-	mkdir -p tmp
-	$(MOC) -o $@ $<
-
-tmp/image_data.o : makemkvgui/bin/image_data.bin
-	mkdir -p tmp
-	ld -r -b binary -o $@.rw $<
-	objcopy --rename-section .data=.rodata2,readonly,alloc,load,data,contents $@.rw $@
-

makemkv-oss-1.8.6.tar.gz/makefile.win32 Deleted

makemkv-oss-1.8.7.tar.gz/Makefile.in Added

@@ -0,0 +1,99 @@
+
+include makefile.common
+
+GCC=@CC@
+MOC=$(strip $(shell which moc-qt4))
+ifeq ($(MOC),)
+MOC=moc
+endif
+
+CFLAGS=@CFLAGS_OPT@ -D_GNU_SOURCE -D_linux_
+DESTDIR=@DESTDIR@
+PREFIX=@prefix@
+ENABLE_GUI=@ENABLE_GUI@
+LIBDIR=$(PREFIX)/lib
+BINDIR=$(PREFIX)/bin
+DATADIR=$(PREFIX)/share
+FFMPEG_CFLAGS=@ffmpeg_CFLAGS@
+FFMPEG_LIBS=@ffmpeg_LIBS@
+INSTALL=@INSTALL@
+OBJCOPY=@OBJCOPY@
+LD=@LD@
+BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine)
+BUILDINFO_BUILD_DATE=$(shell date)
+
+ifeq ($(ENABLE_GUI),yes)
+OUT_GUI=out/makemkv
+endif
+
+all: out/libdriveio.so.0 out/libmakemkv.so.1 $(OUT_GUI) out/libmmbd.so.0
+	@echo "type \"sudo make install\" to install"
+
+clean:
+	-rm -rf out tmp
+
+install: out/libdriveio.so.0 out/libmakemkv.so.1 $(OUT_GUI) out/libmmbd.so.0
+	$(INSTALL) -D -m 644 out/libdriveio.so.0 $(DESTDIR)$(LIBDIR)/libdriveio.so.0
+	$(INSTALL) -D -m 644 out/libmakemkv.so.1 $(DESTDIR)$(LIBDIR)/libmakemkv.so.1
+	$(INSTALL) -D -m 644 out/libmmbd.so.0 $(DESTDIR)$(LIBDIR)/libmmbd.so.0
+ifeq ($(DESTDIR),)
+	ldconfig
+endif
+ifeq ($(ENABLE_GUI),yes)
+	$(INSTALL) -D -m 755 out/makemkv $(DESTDIR)$(BINDIR)/makemkv
+	$(INSTALL) -D -m 644 makemkvgui/share/makemkv.desktop $(DESTDIR)$(DATADIR)/applications/makemkv.desktop
+	$(INSTALL) -D -m 644 makemkvgui/share/icons/16x16/makemkv.png $(DESTDIR)$(DATADIR)/icons/hicolor/16x16/apps/makemkv.png
+	$(INSTALL) -D -m 644 makemkvgui/share/icons/22x22/makemkv.png $(DESTDIR)$(DATADIR)/icons/hicolor/22x22/apps/makemkv.png
+	$(INSTALL) -D -m 644 makemkvgui/share/icons/32x32/makemkv.png $(DESTDIR)$(DATADIR)/icons/hicolor/32x32/apps/makemkv.png
+	$(INSTALL) -D -m 644 makemkvgui/share/icons/64x64/makemkv.png $(DESTDIR)$(DATADIR)/icons/hicolor/64x64/apps/makemkv.png
+	$(INSTALL) -D -m 644 makemkvgui/share/icons/128x128/makemkv.png $(DESTDIR)$(DATADIR)/icons/hicolor/128x128/apps/makemkv.png
+endif
+
+out/%: out/%.full
+	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
+
+out/libdriveio.so.0.full:
+	mkdir -p out
+	$(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBDRIVEIO_INC) $(LIBDRIVEIO_SRC) \
+	-fPIC -Xlinker -dy -Xlinker --version-script=libdriveio/src/libdriveio.vers \
+	-Xlinker -soname=libdriveio.so.0 -lc -lstdc++
+
+out/libmakemkv.so.1.full: tmp/gen_buildinfo.h
+	mkdir -p out
+	$(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBEBML_DEF) $(LIBMATROSKA_INC) \
+	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFABI_INC) \
+	$(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \
+	$(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFABI_SRC) \
+	-DHAVE_BUILDINFO_H -Itmp $(FFMPEG_CFLAGS) \
+	-fPIC -Xlinker -dy -Xlinker --version-script=libmakemkv/src/libmakemkv.vers \
+	-Xlinker -soname=libmakemkv.so.1 -lc -lstdc++ -lcrypto -lz -lexpat $(FFMPEG_LIBS) -lm
+
+out/libmmbd.so.0.full:
+	mkdir -p out
+	$(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(MAKEMKVGUI_INC) $(LIBMMBD_INC) \
+	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBABI_INC) $(LIBMMBD_SRC) $(LIBMMBD_SRC_LINUX) $(SSTRING_SRC) \
+	-fPIC -Xlinker -dy -Xlinker --version-script=libmmbd/src/libmmbd.vers \
+	-Xlinker -soname=libmmbd.so.0 -lc -lstdc++ -lrt -lpthread -lcrypto
+
+out/makemkv.full: $(MAKEMKVGUI_GEN) $(MAKEMKVGUI_SRC_LINUX) tmp/gen_buildinfo.h
+	mkdir -p out
+	$(GCC) $(CFLAGS) -o$@ $(MAKEMKVGUI_INC) $(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBDRIVEIO_INC) $(LIBABI_INC) \
+	$(MAKEMKVGUI_SRC) $(MAKEMKVGUI_SRC_LINUX) $(MAKEMKVGUI_GEN) $(SSTRING_SRC) $(LIBDRIVEIO_SRC_PUB) \
+	-DHAVE_BUILDINFO_H -Itmp \
+	-I/usr/include/qt4 -I/usr/lib/qt4/include -L/usr/lib/qt4 -L/usr/lib/qt4/lib -lc -lstdc++ \
+	-lQtGui -lQtCore -lQtDBus -lpthread -lz -lrt
+
+tmp/gen_buildinfo.h:
+	mkdir -p tmp
+	echo "#define BUILDINFO_ARCH_NAME \"$(BUILDINFO_ARCH_NAME)\"" >> $@
+	echo "#define BUILDINFO_BUILD_DATE \"$(BUILDINFO_BUILD_DATE)\"" >> $@
+
+tmp/moc_%.cpp : makemkvgui/src/%.h
+	mkdir -p tmp
+	$(MOC) -o $@ $<
+
+tmp/image_data.o : makemkvgui/bin/image_data.bin
+	mkdir -p tmp
+	$(LD) -r -b binary -o $@.rw $<
+	$(OBJCOPY) --rename-section .data=.rodata2,readonly,alloc,load,data,contents $@.rw $@
+

makemkv-oss-1.8.7.tar.gz/autoxxx Added

makemkv-oss-1.8.7.tar.gz/autoxxx/config.guess Added

@@ -0,0 +1,1530 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:

makemkv-oss-1.8.7.tar.gz/autoxxx/config.sub Added

@@ -0,0 +1,1773 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+
+timestamp='2012-02-10'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)

makemkv-oss-1.8.7.tar.gz/autoxxx/install-sh Added

@@ -0,0 +1,527 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2011-01-19.21; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=!]) dst_arg=./$dst_arg;;
+	esac
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+

makemkv-oss-1.8.7.tar.gz/configure Added

@@ -0,0 +1,6222 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.68 for ffabi 0.
+#
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\$.*\$"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\$.*\$$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
+      esac;
+      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :

makemkv-oss-1.8.6.tar.gz/libabi/src/sys_linux.c -> makemkv-oss-1.8.7.tar.gz/libabi/src/sys_linux.c Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/Debug.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/Debug.h Changed

@@ -52,7 +52,7 @@
 
 static const int MAX_PREFIX_LENGTH = 128;
 
-#if defined(DEBUG)
+#if defined(LIBEBML_DEBUG_TRACE)
 // define the working debugging class
 
 class EBML_DLL_API ADbg  
@@ -102,21 +102,21 @@
 #endif // WIN32
 };
 
-#else // defined(DEBUG)
+#else // defined(LIBEBML_DEBUG_TRACE)
 
 // define a class that does nothing (no output)
 
 class EBML_DLL_API ADbg
 {
 public:
-	ADbg(int level = 0){}
+	ADbg(int /* level */ = 0){}
 	virtual ~ADbg() {}
 
-	inline int OutPut(int level, const char * format,...) const {
+	inline int OutPut(int /* level */, const char * /* format */,...) const {
 		return 0;
 	}
 
-	inline int OutPut(const char * format,...) const {
+	inline int OutPut(const char * /* format */,...) const {
 		return 0;
 	}
 
@@ -124,11 +124,11 @@
 		return level;
 	}
 
-	inline bool setIncludeTime(const bool included = true) {
+	inline bool setIncludeTime(const bool /* included */ = true) {
 		return true;
 	}
 
-	inline bool setDebugFile(const char * NewFilename) {
+	inline bool setDebugFile(const char * /* NewFilename */) {
 		return true;
 	}
 
@@ -136,7 +136,7 @@
 		return true;
 	}
 
-	inline bool setUseFile(const bool usefile = true) {
+	inline bool setUseFile(const bool /* usefile */ = true) {
 		return true;
 	}
 
@@ -145,12 +145,12 @@
 	}
 };
 
-#endif // defined(DEBUG)
+#endif // defined(LIBEBML_DEBUG_TRACE)
 
 extern class EBML_DLL_API ADbg globalDebug;
 
 
-#ifdef LIBEBML_DEBUG
+#ifdef LIBEBML_DEBUG_TRACE
 #define EBML_TRACE globalDebug.OutPut
 #else
 #define EBML_TRACE

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlBinary.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlBinary.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlConfig.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlConfig.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlCrc32.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlCrc32.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlDate.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlDate.h Changed

@@ -28,7 +28,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlDate.h 270 2010-05-25 12:02:30Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_DATE_H
@@ -52,20 +52,22 @@
 			\brief set the date with a UNIX/C/EPOCH form
 			\param NewDate UNIX/C date in UTC (no timezone)
 		*/
-		void SetEpochDate(int32 NewDate) {myDate = int64(NewDate - UnixEpochDelay) * 1000000000; SetValueIsSet();}
+		void SetEpochDate(int64 NewDate) {myDate = (NewDate - UnixEpochDelay) * 1000000000; SetValueIsSet();}
+    EbmlDate &SetValue(int64 NewValue) {SetEpochDate(NewValue); return *this;}
 
 		/*!
 			\brief get the date with a UNIX/C/EPOCH form
 			\note the date is in UTC (no timezone)
 		*/
-		int32 GetEpochDate() const {return int32(myDate/1000000000 + UnixEpochDelay);}
+		int64 GetEpochDate() const {return int64(myDate/1000000000 + UnixEpochDelay);}
+    int64 GetValue() const {return GetEpochDate();}
 
 		virtual bool ValidateSize() const {return IsFiniteSize() && ((GetSize() == 8) || (GetSize() == 0));}
 
 		/*!
 			\note no Default date handled
 		*/
-		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false) {
+		filepos_t UpdateSize(bool /* bWithDefault = false */, bool /* bForceRender = false */) {
 			if(!ValueIsSet())
 				SetSize_(0);
 			else

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlDummy.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlDummy.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlElement.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlElement.h Changed

@@ -28,7 +28,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlElement.h 364 2010-06-30 06:07:40Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_ELEMENT_H
@@ -116,6 +116,12 @@
     const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
     x::x() :EbmlUInteger(defval) {}
 
+#define DEFINE_xxx_SINTEGER_DEF(x,id,idl,parent,name,global,defval) \
+    const EbmlId Id_##x    (id, idl); \
+    const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
+    const EbmlCallbacks x::ClassInfos(x::Create, Id_##x, name, Context_##x); \
+    x::x() :EbmlSInteger(defval) {}
+
 #define DEFINE_xxx_STRING_DEF(x,id,idl,parent,name,global,defval) \
     const EbmlId Id_##x    (id, idl); \
     const EbmlSemanticContext Context_##x = EbmlSemanticContext(0, NULL, &Context_##parent, global, &EBML_INFO(x)); \
@@ -448,6 +454,7 @@
 		uint64 VoidMe(IOCallback & output, bool bWithDefault = false);
 
 		bool DefaultISset() const {return DefaultIsSet;}
+		void ForceNoDefault() {SetDefaultIsSet(false);}
 		virtual bool IsDefaultValue() const = 0;
 		bool IsFiniteSize() const {return bSizeIsFinite;}

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlFloat.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlFloat.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlMaster.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlMaster.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlSInteger.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlSInteger.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlStream.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlStream.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlString.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlString.h Changed

@@ -30,13 +30,13 @@
 
 /*!
 	\file
-	\version \$Id: EbmlString.h 347 2010-06-26 09:07:13Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_STRING_H
 #define LIBEBML_STRING_H
 
-#include <string>
+#include <lgpl/stdstring.h>
 
 #include "EbmlTypes.h"
 #include "EbmlElement.h"
@@ -50,7 +50,7 @@
 class EBML_DLL_API EbmlString : public EbmlElement {
 	public:
 		EbmlString();
-		EbmlString(const std::string & aDefaultValue);
+		EbmlString(const ccc::string & aDefaultValue);
 		EbmlString(const EbmlString & ElementToClone);
 	
 		virtual ~EbmlString() {}
@@ -60,12 +60,15 @@
 		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
 		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
 	
-		EbmlString & operator=(const std::string &);
-		operator const std::string &() const;
+		EbmlString & operator=(const ccc::string &);
+		operator const ref::string &() const;
 	
-		void SetDefaultValue(std::string &);
+    EbmlString &SetValue(ccc::string const &NewValue);
+    ref::string GetValue() const;
+
+		void SetDefaultValue(ccc::string &);
     
-		const std::string & DefaultVal() const;
+		const ref::string & DefaultVal() const;
 
 		bool IsDefaultValue() const {
 			return (DefaultISset() && Value == DefaultValue);
@@ -76,8 +79,8 @@
 #else
     protected:
 #endif
-		std::string Value;  /// The actual value of the element
-		std::string DefaultValue;
+		buf::string Value;  /// The actual value of the element
+		buf::string DefaultValue;
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlSubHead.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlSubHead.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlUInteger.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlUInteger.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlUnicodeString.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlUnicodeString.h Changed

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlUnicodeString.h 347 2010-06-26 09:07:13Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author Moritz Bunkus <moritz @ bunkus.org>
 	\author Jory Stone       <jcsston @ toughguy.net>
@@ -38,7 +38,7 @@
 #ifndef LIBEBML_UNICODE_STRING_H
 #define LIBEBML_UNICODE_STRING_H
 
-#include <string>
+#include <lgpl/stdstring.h>
 
 #include "EbmlTypes.h"
 #include "EbmlElement.h"
@@ -57,6 +57,7 @@
 	UTFstring();
 	UTFstring(const wchar_t *); // should be NULL terminated
 	UTFstring(const UTFstring &);
+	//UTFstring(std::wstring const &);
 	
 	virtual ~UTFstring();
 	bool operator==(const UTFstring&) const;
@@ -74,8 +75,8 @@
 	operator const wchar_t*() const;
 	const wchar_t* c_str() const {return _Data;}
 
-	const std::string & GetUTF8() const {return UTF8string;}
-	void SetUTF8(const std::string &);
+	const ref::string & GetUTF8() const {return UTF8string;}
+	void SetUTF8(const ccc::string &);
 
 #if defined(EBML_STRICT_API)
     private:
@@ -84,7 +85,7 @@
 #endif
 	size_t _Length; ///< length of the UCS string excluding the \0
 	wchar_t* _Data; ///< internal UCS representation	
-	std::string UTF8string;
+	buf::string UTF8string;
 	static bool wcscmp_internal(const wchar_t *str1, const wchar_t *str2);
 	void UpdateFromUTF8();
 	void UpdateFromUCS2();
@@ -112,6 +113,11 @@
 		EbmlUnicodeString & operator=(const UTFstring &); ///< platform dependant code
 		operator const UTFstring &() const;
 	
+    EbmlUnicodeString &SetValue(UTFstring const &NewValue);
+    EbmlUnicodeString &SetValueUTF8(ccc::string const &NewValue);
+    UTFstring GetValue() const;
+    ref::string GetValueUTF8() const;
+
 		void SetDefaultValue(UTFstring &);
     
 		const UTFstring & DefaultVal() const;

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/EbmlVersion.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/EbmlVersion.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/inc/ebml/MemIOCallback.h -> makemkv-oss-1.8.7.tar.gz/libebml/inc/ebml/MemIOCallback.h Changed

makemkv-oss-1.8.6.tar.gz/libebml/src/Debug.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/Debug.cpp Changed

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlBinary.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlBinary.cpp Changed

@@ -30,10 +30,11 @@
 
 /*!
 	\file
-	\version \$Id: EbmlBinary.cpp 520 2010-08-19 12:01:28Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author Julien Coloos	<suiryc @ users.sf.net>
 */
+#include <lgpl/stdstring.h>
 #include <lgpl/cassert>
 
 #include "ebml/EbmlBinary.h"
@@ -65,7 +66,7 @@
 EbmlBinary::operator const binary &() const {return *Data;}
 
 
-filepos_t EbmlBinary::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
+filepos_t EbmlBinary::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
 	output.writeFully(Data,GetSize());
 
@@ -75,7 +76,7 @@
 /*!
 	\note no Default binary value handled
 */
-uint64 EbmlBinary::UpdateSize(bool bWithDefault, bool bForceRender)
+uint64 EbmlBinary::UpdateSize(bool /* bWithDefault */, bool /* bForceRender */)
 {
 	return GetSize();
 }
@@ -92,9 +93,9 @@
 		return GetSize();
 	}
 
-	Data = (binary *)malloc(GetSize() * sizeof(binary));
+	Data = (binary *)malloc(GetSize());
     if (Data == NULL)
-        throw CRTError("Error allocating data");
+		throw CRTError(std::string("Error allocating data"));
 	SetValueIsSet();
 	return input.read(Data, GetSize());
 }

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlCrc32.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlCrc32.cpp Changed

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlDate.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlDate.cpp Changed

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlDummy.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlDummy.cpp Changed

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlElement.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlElement.cpp Changed

@@ -28,7 +28,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlElement.cpp 364 2010-06-30 06:07:40Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
@@ -487,6 +487,7 @@
 				Result = DataStream.FindNextElement(Context, bUpperElement, 0xFFFFFFFFL, AllowDummyElt);
 			} else {
 				Result = TestReadElt;
+                TestReadElt = NULL;
 			}
 
 			if (Result != NULL) {
@@ -583,14 +584,14 @@
 		if (!bWithDefault && IsDefaultValue()) {
 			return 0;
 		}
-#if defined(_DEBUG) || defined(DEBUG) || defined(LIBEBML_DEBUG)
+#if defined(LIBEBML_DEBUG)
 		uint64 SupposedSize = UpdateSize(bWithDefault, bForceRender);
-#endif // _DEBUG
+#endif // LIBEBML_DEBUG
 		filepos_t result = RenderHead(output, bForceRender, bWithDefault, bKeepPosition);
 		uint64 WrittenSize = RenderData(output, bForceRender, bWithDefault);
-#if defined(_DEBUG) || defined(DEBUG) || defined(LIBEBML_DEBUG)
-	if (SupposedSize != (0-1)) assert(WrittenSize == SupposedSize);
-#endif // DEBUG
+#if defined(LIBEBML_DEBUG)
+	if (static_cast<int64>(SupposedSize) != (0-1)) assert(WrittenSize == SupposedSize);
+#endif // LIBEBML_DEBUG
 		result += WrittenSize;
 		return result;
 /*
@@ -659,7 +660,7 @@
 }
 
 #ifndef EBML_NO_READ
-void EbmlElement::Read(EbmlStream & inDataStream, const EbmlSemanticContext & Context, int & UpperEltFound, EbmlElement * & FoundElt, bool AllowDummyElt, ScopeMode ReadFully)
+void EbmlElement::Read(EbmlStream & inDataStream, const EbmlSemanticContext & /* Context */, int & /* UpperEltFound */, EbmlElement * & /* FoundElt */, bool /* AllowDummyElt */, ScopeMode ReadFully)
 {
 	ReadData(inDataStream.I_O(), ReadFully);
 }

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlFloat.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlFloat.cpp Changed

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlFloat.cpp 347 2010-06-26 09:07:13Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
@@ -67,21 +67,26 @@
     SetDefaultIsSet();
 }
 
-const double EbmlFloat::DefaultVal() const
+double EbmlFloat::DefaultVal() const
 {
     assert(DefaultISset());
     return DefaultValue;
 }
 
-EbmlFloat::operator const float() const {return float(Value);}
-EbmlFloat::operator const double() const {return double(Value);}
+EbmlFloat::operator float() const {return float(Value);}
+EbmlFloat::operator double() const {return double(Value);}
 
+double EbmlFloat::GetValue() const {return Value;}
+
+EbmlFloat & EbmlFloat::SetValue(double NewValue) {
+  return *this = NewValue;
+}
 
 /*!
 	\todo handle exception on errors
 	\todo handle 10 bits precision
 */
-filepos_t EbmlFloat::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
+filepos_t EbmlFloat::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
 	assert(GetSize() == 4 || GetSize() == 8);
 
@@ -102,7 +107,7 @@
 	return GetSize();
 }
 
-uint64 EbmlFloat::UpdateSize(bool bWithDefault, bool bForceRender)
+uint64 EbmlFloat::UpdateSize(bool bWithDefault, bool  /* bForceRender */)
 {
 	if (!bWithDefault && IsDefaultValue())
 		return 0;

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlMaster.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlMaster.cpp Changed

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlMaster.cpp 493 2010-08-12 18:27:18Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
@@ -145,10 +145,10 @@
 			continue;
 		(ElementList[Index])->UpdateSize(bWithDefault, bForceRender);
 		uint64 SizeToAdd = (ElementList[Index])->ElementSize(bWithDefault);
-#if defined(_DEBUG) || defined(DEBUG) || defined(LIBEBML_DEBUG)
-		if (SizeToAdd == (0-1))
+#if defined(LIBEBML_DEBUG)
+		if (static_cast<int64>(SizeToAdd) == (0-1))
 			return (0-1);
-#endif // DEBUG
+#endif // LIBEBML_DEBUG
 		SetSize_(GetSize() + SizeToAdd);
 	}
 	if (bChecksumUsed) {
@@ -168,7 +168,7 @@
 	\todo this code is very suspicious !
 */
 #ifndef EBML_NO_READ
-filepos_t EbmlMaster::ReadData(IOCallback & input, ScopeMode ReadFully)
+filepos_t EbmlMaster::ReadData(IOCallback & input, ScopeMode /* ReadFully */)
 {
 	input.setFilePointer(GetSize(), seek_current);
 	return GetSize();
@@ -206,10 +206,10 @@
 	for (EltIdx = 0; EltIdx < EBML_CTX_SIZE(Context); EltIdx++) {
 		if (EBML_CTX_IDX(Context,EltIdx).IsMandatory()) {
 			if (FindElt(EBML_CTX_IDX_INFO(Context,EltIdx)) == NULL) {
-#if defined(_DEBUG) || defined(DEBUG) || defined(LIBEBML_DEBUG)
+#if defined(LIBEBML_DEBUG)
 				// you are missing this Mandatory element
 // 				const char * MissingName = EBML_INFO_NAME(EBML_CTX_IDX_INFO(Context,EltIdx));
-#endif // DEBUG
+#endif // LIBEBML_DEBUG
 				return false;
 			}
 		}
@@ -218,6 +218,7 @@
 	return true;
 }
 
+#if 0
 std::vector<std::string> EbmlMaster::FindAllMissingElements()
 {	
 	assert(Context.GetSize() != 0);
@@ -261,6 +262,7 @@
 
 	return missingElements;
 }
+#endif
 
 EbmlElement *EbmlMaster::FindElt(const EbmlCallbacks & Callbacks) const
 {

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlSInteger.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlSInteger.cpp Changed

@@ -28,7 +28,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlSInteger.cpp 347 2010-06-26 09:07:13Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author Moritz Bunkus <moritz @ bunkus.org>
 */
@@ -55,15 +55,21 @@
 {
 }
 
-EbmlSInteger::operator int8() {return  int8(Value);}
-EbmlSInteger::operator int16() {return int16(Value);}
-EbmlSInteger::operator int32() {return int32(Value);}
-EbmlSInteger::operator int64() {return Value;}
+EbmlSInteger::operator int8() const {return  int8(Value);}
+EbmlSInteger::operator int16() const {return int16(Value);}
+EbmlSInteger::operator int32() const {return int32(Value);}
+EbmlSInteger::operator int64() const {return Value;}
+
+int64 EbmlSInteger::GetValue() const {return Value;}
+
+EbmlSInteger & EbmlSInteger::SetValue(int64 NewValue) {
+  return *this = NewValue;
+}
 
 /*!
 	\todo handle exception on errors
 */
-filepos_t EbmlSInteger::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
+filepos_t EbmlSInteger::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
 	binary FinalData[8]; // we don't handle more than 64 bits integers
 	unsigned int i;
@@ -82,7 +88,7 @@
 	return GetSize();
 }
 
-uint64 EbmlSInteger::UpdateSize(bool bWithDefault, bool bForceRender)
+uint64 EbmlSInteger::UpdateSize(bool bWithDefault, bool /* bForceRender */)
 {
 	if (!bWithDefault && IsDefaultValue())
 		return 0;

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlStream.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlStream.cpp Changed

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlString.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlString.cpp Changed

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlString.cpp 347 2010-06-26 09:07:13Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include <lgpl/cassert>
@@ -49,7 +49,7 @@
 		SetSize_(GetDefaultSize());*/
 }
 
-EbmlString::EbmlString(const std::string & aDefaultValue)
+EbmlString::EbmlString(const ccc::string & aDefaultValue)
  :EbmlElement(0, true), Value(aDefaultValue), DefaultValue(aDefaultValue)
 {
 	SetDefaultSize(0);
@@ -70,14 +70,14 @@
 {
 }
 
-void EbmlString::SetDefaultValue(std::string & aValue)
+void EbmlString::SetDefaultValue(ccc::string & aValue)
 {
     assert(!DefaultISset());
     DefaultValue = aValue;
     SetDefaultIsSet();
 }
 
-const std::string & EbmlString::DefaultVal() const
+const ref::string & EbmlString::DefaultVal() const
 {
     assert(DefaultISset());
     return DefaultValue;
@@ -87,7 +87,7 @@
 /*!
 	\todo handle exception on errors
 */
-filepos_t EbmlString::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
+filepos_t EbmlString::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
 	filepos_t Result;
 	output.writeFully(Value.c_str(), Value.length());
@@ -109,9 +109,9 @@
 	return Result;
 }
 
-EbmlString::operator const std::string &() const {return Value;}
+EbmlString::operator const ref::string &() const {return Value;}
 
-EbmlString & EbmlString::operator=(const std::string & NewString)
+EbmlString & EbmlString::operator=(const ccc::string & NewString)
 {
 	Value = NewString;
 	SetValueIsSet();
@@ -122,7 +122,15 @@
 	return *this;
 }
 
-uint64 EbmlString::UpdateSize(bool bWithDefault, bool bForceRender)
+EbmlString &EbmlString::SetValue(ccc::string const &NewValue) {
+  return *this = NewValue;
+}
+
+ref::string EbmlString::GetValue() const {
+  return Value;
+}
+
+uint64 EbmlString::UpdateSize(bool bWithDefault, bool /* bForceRender */)
 {
 	if (!bWithDefault && IsDefaultValue())
 		return 0;

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlUInteger.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlUInteger.cpp Changed

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlUInteger.cpp 347 2010-06-26 09:07:13Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author Moritz Bunkus <moritz @ bunkus.org>
 */
@@ -75,11 +75,16 @@
 EbmlUInteger::operator uint32() const {return uint32(Value);}
 EbmlUInteger::operator uint64() const {return Value;}
 
+uint64 EbmlUInteger::GetValue() const {return Value;}
+
+EbmlUInteger & EbmlUInteger::SetValue(uint64 NewValue) {
+  return *this = NewValue;
+}
 
 /*!
 	\todo handle exception on errors
 */
-filepos_t EbmlUInteger::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
+filepos_t EbmlUInteger::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
 	binary FinalData[8]; // we don't handle more than 64 bits integers
 	
@@ -97,7 +102,7 @@
 	return GetSize();
 }
 
-uint64 EbmlUInteger::UpdateSize(bool bWithDefault, bool bForceRender)
+uint64 EbmlUInteger::UpdateSize(bool bWithDefault, bool /* bForceRender */)
 {
 	if (!bWithDefault && IsDefaultValue())
 		return 0;

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlUnicodeString.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlUnicodeString.cpp Changed

@@ -30,7 +30,7 @@
 
 /*!
 	\file
-	\version \$Id: EbmlUnicodeString.cpp 647 2011-01-29 11:42:15Z mosub $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author Jory Stone       <jcsston @ toughguy.net>
 */
@@ -59,6 +59,15 @@
 	*this = _aBuf;
 }
 
+#if 0
+UTFstring::UTFstring(std::wstring const &_aBuf)
+	:_Length(0)
+	,_Data(NULL)
+{
+	*this = _aBuf.c_str();
+}
+#endif
+
 UTFstring::~UTFstring()
 {
 	delete [] _Data;
@@ -122,7 +131,7 @@
 	return wcscmp_internal(_Data, _aStr._Data);
 }
 
-void UTFstring::SetUTF8(const std::string & _aStr)
+void UTFstring::SetUTF8(const ccc::string & _aStr)
 {
 	UTF8string = _aStr;
 	UpdateFromUTF8();
@@ -183,11 +192,11 @@
 			Size++;
 		} else if (_Data[i] < 0x800) {
 			Size += 2;
-		} else if (_Data[i] < 0x10000) {
+		} else {
 			Size += 3;
 		}
 	}
-	std::string::value_type *tmpStr = new std::string::value_type[Size+1];
+    char *tmpStr = new char[Size+1];
 	for (i=0, Size=0; i<_Length; i++)
 	{
 		if (_Data[i] < 0x80) {
@@ -195,7 +204,7 @@
 		} else if (_Data[i] < 0x800) {
 			tmpStr[Size++] = 0xC0 | (_Data[i] >> 6);
 			tmpStr[Size++] = 0x80 | (_Data[i] & 0x3F);
-		} else if (_Data[i] < 0x10000) {
+		} else {
 			tmpStr[Size++] = 0xE0 | (_Data[i] >> 12);
 			tmpStr[Size++] = 0x80 | ((_Data[i] >> 6) & 0x3F);
 			tmpStr[Size++] = 0x80 | (_Data[i] & 0x3F);
@@ -256,7 +265,7 @@
 \note limited to UCS-2
 \todo handle exception on errors
 */
-filepos_t EbmlUnicodeString::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
+filepos_t EbmlUnicodeString::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
 	uint32 Result = Value.GetUTF8().length();
 
@@ -288,10 +297,28 @@
 	return *this;
 }
 
+EbmlUnicodeString &EbmlUnicodeString::SetValue(UTFstring const &NewValue) {
+  return *this = NewValue;
+}
+
+EbmlUnicodeString &EbmlUnicodeString::SetValueUTF8(ccc::string const &NewValue) {
+  UTFstring NewValueUTFstring;
+  NewValueUTFstring.SetUTF8(NewValue);
+  return *this = NewValueUTFstring;
+}
+
+UTFstring EbmlUnicodeString::GetValue() const {
+  return Value;
+}
+
+ref::string EbmlUnicodeString::GetValueUTF8() const {
+  return Value.GetUTF8();
+}
+
 /*!
 \note limited to UCS-2
 */
-uint64 EbmlUnicodeString::UpdateSize(bool bWithDefault, bool bForceRender)
+uint64 EbmlUnicodeString::UpdateSize(bool bWithDefault, bool /* bForceRender */)
 {
 	if (!bWithDefault && IsDefaultValue())
 		return 0;

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlVersion.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlVersion.cpp Changed

makemkv-oss-1.8.6.tar.gz/libebml/src/EbmlVoid.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/EbmlVoid.cpp Changed

makemkv-oss-1.8.6.tar.gz/libebml/src/MemIOCallback.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/MemIOCallback.cpp Changed

makemkv-oss-1.8.6.tar.gz/libebml/src/StdIOCallback.cpp -> makemkv-oss-1.8.7.tar.gz/libebml/src/StdIOCallback.cpp Changed

makemkv-oss-1.8.6.tar.gz/libffabi/src/ffabi.c -> makemkv-oss-1.8.7.tar.gz/libffabi/src/ffabi.c Changed

@@ -162,7 +162,7 @@
     ctx->avctx->opaque = logctx;
     ctx->avctx->time_base.num = 1;
     ctx->avctx->time_base.den = time_base;
-#if (LIBAVCODEC_VERSION_MAJOR >= 54)
+#ifdef FFABI_HAVE_REFCOUNTED_FRAMES
     ctx->avctx->refcounted_frames = 1;
 #endif
 
@@ -233,8 +233,10 @@
     r = avcodec_decode_audio4(ctx->avctx,ctx->frame,&ctx->have_frame,&avpkt);
 
     if (ctx->have_frame) {
-#if (LIBAVCODEC_VERSION_MAJOR >= 54)
+#ifdef FFABI_HAVE_AV_FRAME_CHANNELS
         if (av_frame_get_channels(ctx->frame) != ctx->avctx->channels) { cold(); return -1; }
+#endif
+#ifdef FFABI_HAVE_AV_FRAME_SAMPLE_RATE
         if (av_frame_get_sample_rate(ctx->frame) != ctx->avctx->sample_rate) { cold(); return -1; }
 #endif
         if (ctx->frame->format != ctx->avctx->sample_fmt) { cold(); return -1; }
@@ -317,7 +319,7 @@
         ffm_audio_encode_close(ctx);
         return NULL;
     }
-#if (LIBAVCODEC_VERSION_MAJOR >= 54)
+#ifdef FFABI_HAVE_REFCOUNTED_FRAMES
     ctx->avctx->refcounted_frames = 1;
 #endif
     ctx->avctx->opaque = logctx;
@@ -389,11 +391,12 @@
     if (frame_data) {
         frame = ctx->frame;
         frame->format = ctx->avctx->sample_fmt;
-#if (LIBAVCODEC_VERSION_MAJOR >= 54)
+#ifdef FFABI_HAVE_AV_FRAME_CHANNELS
         av_frame_set_channels(frame,ctx->avctx->channels);
+#endif
+#ifdef FFABI_HAVE_AV_FRAME_CHANNEL_LAYOUT
         av_frame_set_channel_layout(frame,ctx->avctx->channel_layout);
 #endif
-
         frame->data[0] = (uint8_t*)frame_data[0];
         frame->linesize[0] = frame_size;
 
@@ -438,6 +441,8 @@
     enum AVSampleFormat sfmt = translate_sample_fmt(fmt);
     int i = 0;
 
+    if (sfmt==AV_SAMPLE_FMT_NONE) return -4;
+
     if (encode) {
         codec = avcodec_find_encoder(translate_codec_id(id));
     } else {
@@ -511,7 +516,7 @@
     info->channel_layout = avctx->channel_layout;
     *bitrate = avctx->bit_rate;
 
-#if (LIBAVCODEC_VERSION_MAJOR < 54)
+#ifndef FFABI_HAVE_PARSER_DURATION
     info->frame_size = avctx->frame_size;
 #else
     info->frame_size = pctx->duration;
@@ -562,4 +567,3 @@
     return 0;
 }
 
-

makemkv-oss-1.8.7.tar.gz/libffabi/src/ffabicfg.h.in Added

@@ -0,0 +1,48 @@
+/*
+    libMakeMKV - MKV multiplexer library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com>
+
+    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
+
+*/
+
+/* AVCodecID */
+#undef FFABI_HAVE_AVCODECID
+
+/* have avcodec_free_frame */
+#undef FFABI_HAVE_AVCODEC_FREE_FRAME
+
+/* AV_CODEC_ID_XXX */
+#undef FFABI_HAVE_AV_CODEC_ID_NAMES
+
+/* have av_frame_get_channels */
+#undef FFABI_HAVE_AV_FRAME_CHANNELS
+
+/* have av_frame_get_sample_rate */
+#undef FFABI_HAVE_AV_FRAME_SAMPLE_RATE
+
+/* have av_frame_set_channel_layout */
+#undef FFABI_HAVE_AV_FRAME_CHANNEL_LAYOUT
+
+/* have av_log_format_line */
+#undef FFABI_HAVE_AV_LOG_FORMAT_LINE
+
+/* have AVCodecParserContext.duration */
+#undef FFABI_HAVE_PARSER_DURATION
+
+/* have refcounted frames */
+#undef FFABI_HAVE_REFCOUNTED_FRAMES
+

makemkv-oss-1.8.6.tar.gz/libffabi/src/internal.h -> makemkv-oss-1.8.7.tar.gz/libffabi/src/internal.h Changed

@@ -1,7 +1,28 @@
+/*
+    libMakeMKV - MKV multiplexer library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com>
+
+    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
+
+*/
 #ifndef FFABI_INTERNAL_H
 #define FFABI_INTERNAL_H
 
 #include <libavutil/samplefmt.h>
+#include <libavutil/mem.h>
 #include <libavcodec/avcodec.h>
 #include <libavcodec/version.h>
 
@@ -22,30 +43,37 @@
 #error "Can't use an ancient ffmpeg or libav"
 #endif
 
-#if (LIBAVCODEC_VERSION_MAJOR == 53)
+#include "ffabicfg.h"
 
+#ifndef FFABI_HAVE_AVCODECID
 #define AVCodecID CodecID
+#endif
+
+#ifndef FFABI_HAVE_AV_CODEC_ID_NAMES
 #define AV_CODEC_ID_NONE CODEC_ID_NONE
 #define AV_CODEC_ID_AC3 CODEC_ID_AC3
 #define AV_CODEC_ID_DTS CODEC_ID_DTS
 #define AV_CODEC_ID_FLAC CODEC_ID_FLAC
 #define AV_CODEC_ID_MLP CODEC_ID_MLP
 #define AV_CODEC_ID_TRUEHD CODEC_ID_TRUEHD
+#endif
 
+#ifndef FFABI_HAVE_AVCODEC_FREE_FRAME
 static inline void avcodec_free_frame(AVFrame **frame)
 {
     av_freep(frame);
 }
+#endif
 
+#ifndef FFABI_HAVE_REFCOUNTED_FRAMES
 static inline void av_frame_unref(AVFrame *frame)
 {
 }
+#endif
 
-#if (LIBAVCODEC_VERSION_MINOR < 40)
+#ifndef FFABI_HAVE_AV_LOG_FORMAT_LINE
 void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl,
                         char *line, int line_size, int *print_prefix);
 #endif
 
-#endif
-
 #endif /* FFABI_INTERNAL_H */

makemkv-oss-1.8.6.tar.gz/libffabi/src/log.c -> makemkv-oss-1.8.7.tar.gz/libffabi/src/log.c Changed

makemkv-oss-1.8.7.tar.gz/libmakemkv/inc/lgpl/stdstring.h Added

@@ -0,0 +1,78 @@
+/*
+    libMakeMKV - MKV multiplexer library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com>
+
+    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
+
+*/
+#ifndef STDSTRING_LGPL_H_INCLUDED
+#define STDSTRING_LGPL_H_INCLUDED
+
+#include <string.h>
+
+class StringPointer
+{
+protected:
+    char* data;
+public:
+    inline const char* c_str() const { return data; }
+    inline size_t length() const { return strlen(data); }
+    inline bool operator==(const StringPointer& value) const { return(0==strcmp(data,value.data)); }
+    inline char operator[](size_t pos) const { return data[pos]; }
+};
+
+namespace ccc
+{
+    typedef const char* string;
+};
+
+namespace ref
+{
+    class string : public StringPointer
+    {
+    public:
+        inline string(const StringPointer& value) { data=(char*)value.c_str(); }
+    private:
+        inline string();
+        inline string(const char* value);
+    };
+};
+
+namespace buf
+{
+    class string : public StringPointer
+    {
+    private:
+        void assign(const char* value);
+        static const char* emptyString;
+    public:
+        inline string() { data=(char*)emptyString; }
+        inline string(const char* value) { data=(char*)emptyString; assign(value); }
+        inline string(const StringPointer& value) { data=(char*)emptyString; assign(value.c_str()); }
+        inline ~string() { assign(emptyString); }
+    public:
+        inline void operator=(const char* value) { assign(value); }
+        inline void operator=(const StringPointer& value) { assign(value.c_str()); }
+        inline operator ref::string const & () const
+        {
+            const StringPointer *p=this;
+            const ref::string* pr = static_cast<const ref::string*>(p);
+            return *pr;
+        }
+    };
+};
+
+#endif // STDSTRING_LGPL_H_INCLUDED

makemkv-oss-1.8.6.tar.gz/libmakemkv/src/libmakemkv.vers -> makemkv-oss-1.8.7.tar.gz/libmakemkv/src/libmakemkv.vers Changed

makemkv-oss-1.8.6.tar.gz/libmakemkv/src/libmkv.cpp -> makemkv-oss-1.8.7.tar.gz/libmakemkv/src/libmkv.cpp Changed

@@ -48,11 +48,6 @@
     return GetChild<Tv,Te>(&node);
 }
 
-template <class Te> class NoDefault : public Te
-{
-    bool IsDefaultValue() const { return false; };
-};
-
 static inline int64_t ScaleTimecode(int64_t UnscaledTimecode)
 {
     return UnscaledTimecode / TIMECODE_SCALE;
@@ -499,6 +494,7 @@
         GetChild<EbmlUInteger,KaxTrackType>(cur_track) = ttype;
 
         GetChild<EbmlUInteger,KaxTrackFlagDefault>(cur_track) = (0!=(ti->mkv_flags&MKV_TRACK_FLAG_DEFAULT))?1:0;
+        GetChild<EbmlUInteger,KaxTrackFlagDefault>(cur_track).ForceNoDefault();
 
         if (0!=(ti->mkv_flags&MKV_TRACK_FLAG_FORCED))
         {
@@ -513,8 +509,8 @@
             {
                 lgpl_iso6392T(langBuf);
             }
-            cur_track->PushElement(*new NoDefault<KaxTrackLanguage>);
             GetChild<EbmlString,KaxTrackLanguage>(cur_track) = langBuf;
+            GetChild<EbmlString,KaxTrackLanguage>(cur_track).ForceNoDefault();
         } else {
             if (FormatInfo->debug.compatFlags&1)
             {
@@ -547,6 +543,7 @@
         }
 
         GetChild<EbmlUInteger,KaxTrackFlagLacing>(cur_track) = (0!=(ti->mkv_flags&MKV_TRACK_FLAG_LACING))?1:0;
+        GetChild<EbmlUInteger,KaxTrackFlagLacing>(cur_track).ForceNoDefault();
 
         if (mttVideo==ti->type)
         {
@@ -626,8 +623,8 @@
             KaxContentEncoding &ce = GetChild<KaxContentEncoding>(cs);
             KaxContentCompression &cc = GetChild<KaxContentCompression>(ce);
 
-            cc.PushElement(*new NoDefault<KaxContentCompAlgo>);
             GetChild<EbmlUInteger,KaxContentCompAlgo>(cc) = track_info[i].compression_type;
+            GetChild<EbmlUInteger,KaxContentCompAlgo>(cc).ForceNoDefault();
 
             if (ti->header_comp_size)
             {

makemkv-oss-1.8.7.tar.gz/libmakemkv/src/stdstring.cpp Added

@@ -0,0 +1,41 @@
+/*
+    libMakeMKV - MKV multiplexer library
+
+    Copyright (C) 2007-2013 GuinpinSoft inc <libmkv@makemkv.com>
+
+    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
+
+*/
+#include <lgpl/stdstring.h>
+#include <lgpl/cassert>
+
+const char* buf::string::emptyString = "";
+
+void buf::string::assign(const char* value)
+{
+    if (data != emptyString) {
+        delete[] data;
+        data = (char*) emptyString;
+    }
+
+    MKV_ASSERT(value != NULL);
+
+    if (value != emptyString) {
+        size_t len = strlen(value);
+        data = new char[len+1];
+        memcpy(data,value,len+1);
+    }
+}
+

makemkv-oss-1.8.6.tar.gz/libmakemkv/src/version.cpp -> makemkv-oss-1.8.7.tar.gz/libmakemkv/src/version.cpp Changed

makemkv-oss-1.8.6.tar.gz/libmakemkv/src/world.cpp -> makemkv-oss-1.8.7.tar.gz/libmakemkv/src/world.cpp Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/FileKax.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/FileKax.h Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxAttached.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxAttached.h Changed

@@ -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.
 **
@@ -35,39 +35,6 @@
 #ifndef LIBMATROSKA_ATTACHED_H
 #define LIBMATROSKA_ATTACHED_H
 
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlMaster.h"
-#include "ebml/EbmlUnicodeString.h"
-#include "ebml/EbmlString.h"
-#include "ebml/EbmlBinary.h"
-#include "ebml/EbmlUInteger.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-DECLARE_MKX_MASTER(KaxAttached)
-};
-
-DECLARE_MKX_UNISTRING(KaxFileDescription)
-};
-
-DECLARE_MKX_UNISTRING(KaxFileName)
-};
-
-DECLARE_MKX_STRING(KaxMimeType)
-};
-
-DECLARE_MKX_BINARY(KaxFileData)
-};
-
-DECLARE_MKX_BINARY(KaxFileReferral)
-};
-
-DECLARE_MKX_UINTEGER(KaxFileUID)
-};
-
-END_LIBMATROSKA_NAMESPACE
+#include "matroska/KaxSemantic.h"
 
 #endif // LIBMATROSKA_ATTACHED_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxAttachments.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxAttachments.h Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxBlock.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxBlock.h Changed

@@ -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.
 **
@@ -70,7 +70,7 @@
 		{
 			if (bInternalBuffer)
 			{
-				myBuffer = new binary[mySize];
+				myBuffer = new (std::nothrow) binary[mySize];
 				if (myBuffer == NULL)
 					bValidValue = false;
 				else
@@ -84,7 +84,7 @@
 		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 @@
 		bool IsKeyframe() const    { return bIsKeyframe; }
 		bool IsDiscardable() const { return bIsDiscardable; }
 
-		operator KaxInternalBlock &() { return *this; }
 		void SetParent(KaxCluster & aParentCluster);
 
         EBML_CONCRETE_CLASS(KaxSimpleBlock)
@@ -359,9 +358,6 @@
 	BlockBlobType SimpleBlockMode;
 };
 
-DECLARE_MKX_UINTEGER(KaxBlockDuration)
-};
-
 #if MATROSKA_VERSION >= 2
 DECLARE_MKX_BINARY_CONS(KaxBlockVirtual)
 	public:
@@ -374,6 +370,10 @@
 
 		void SetParent(const KaxCluster & aParentCluster) {ParentCluster = &aParentCluster;}
 
+        filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+        
+        filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+
 	protected:
 		uint64 Timecode; // temporary timecode of the first frame if there are more than one
 		uint16 TrackNumber;
@@ -383,21 +383,6 @@
 };
 #endif // MATROSKA_VERSION
 
-DECLARE_MKX_BINARY(KaxBlockAdditional)
-};
-
-DECLARE_MKX_MASTER(KaxBlockAdditions)
-};
-
-DECLARE_MKX_MASTER(KaxBlockMore)
-};
-
-DECLARE_MKX_UINTEGER(KaxBlockAddID)
-};
-
-DECLARE_MKX_BINARY(KaxCodecState)
-};
-
 END_LIBMATROSKA_NAMESPACE
 
 #endif // LIBMATROSKA_BLOCK_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxBlockData.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxBlockData.h Changed

@@ -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.
 **
@@ -38,18 +38,12 @@
 #include "ebml/EbmlUInteger.h"
 #include "ebml/EbmlSInteger.h"
 #include "matroska/KaxDefines.h"
+#include "matroska/KaxBlock.h"
 
 using namespace LIBEBML_NAMESPACE;
 
 START_LIBMATROSKA_NAMESPACE
 
-class KaxReferenceBlock;
-class KaxBlockGroup;
-class KaxBlockBlob;
-
-DECLARE_MKX_UINTEGER(KaxReferencePriority)
-};
-
 /*!
 	\brief element used for B frame-likes
 */
@@ -76,32 +70,6 @@
         void FreeBlob();
 };
 
-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_SINTEGER(KaxReferenceVirtual)
-};
-#endif // MATROSKA_VERSION
-
-DECLARE_MKX_MASTER(KaxTimeSlice)
-};
-
-DECLARE_MKX_MASTER(KaxSlices)
-};
-
-DECLARE_MKX_UINTEGER(KaxSliceLaceNumber)
-};
-
-DECLARE_MKX_UINTEGER(KaxSliceFrameNumber)
-};
-
-DECLARE_MKX_UINTEGER(KaxSliceBlockAddID)
-};
-
-DECLARE_MKX_UINTEGER(KaxSliceDelay)
-};
-
-DECLARE_MKX_UINTEGER(KaxSliceDuration)
-};
-
 END_LIBMATROSKA_NAMESPACE
 
 #endif // LIBMATROSKA_BLOCK_ADDITIONAL_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxChapters.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxChapters.h Changed

@@ -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.
 **
@@ -29,109 +29,12 @@
 
 /*!
 	\file
-	\version \$Id: KaxChapters.h 270 2010-05-25 12:02:30Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_CHAPTERS_H
 #define LIBMATROSKA_CHAPTERS_H
 
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlMaster.h"
-#include "ebml/EbmlUInteger.h"
-#include "ebml/EbmlUnicodeString.h"
-#include "ebml/EbmlString.h"
-#include "ebml/EbmlBinary.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-DECLARE_MKX_MASTER(KaxChapters)
-};
-
-DECLARE_MKX_MASTER(KaxEditionEntry)
-};
-
-DECLARE_MKX_UINTEGER(KaxEditionUID)
-};
-
-DECLARE_MKX_UINTEGER(KaxEditionFlagHidden)
-};
-
-DECLARE_MKX_UINTEGER(KaxEditionFlagDefault)
-};
-
-DECLARE_MKX_UINTEGER(KaxEditionFlagOrdered)
-};
-
-DECLARE_MKX_MASTER(KaxChapterAtom)
-};
-
-DECLARE_MKX_UINTEGER(KaxChapterUID)
-};
-
-DECLARE_MKX_UINTEGER(KaxChapterTimeStart)
-};
-
-DECLARE_MKX_UINTEGER(KaxChapterTimeEnd)
-};
-
-DECLARE_MKX_UINTEGER(KaxChapterFlagHidden)
-};
-
-DECLARE_MKX_UINTEGER(KaxChapterFlagEnabled)
-};
-
-DECLARE_MKX_BINARY(KaxChapterSegmentUID)
-    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(KaxChapterPhysicalEquiv)
-};
-
-DECLARE_MKX_MASTER(KaxChapterTrack)
-};
-
-DECLARE_MKX_UINTEGER(KaxChapterTrackNumber)
-};
-
-DECLARE_MKX_MASTER(KaxChapterDisplay)
-};
-
-DECLARE_MKX_UNISTRING(KaxChapterString)
-};
-
-DECLARE_MKX_STRING(KaxChapterLanguage)
-};
-
-DECLARE_MKX_STRING(KaxChapterCountry)
-};
-
-DECLARE_MKX_MASTER(KaxChapterProcess)
-};
-
-DECLARE_MKX_UINTEGER(KaxChapterProcessCodecID)
-};
-
-DECLARE_MKX_BINARY(KaxChapterProcessPrivate)
-};
-
-DECLARE_MKX_MASTER(KaxChapterProcessCommand)
-};
-
-DECLARE_MKX_UINTEGER(KaxChapterProcessTime)
-};
-
-DECLARE_MKX_BINARY(KaxChapterProcessData)
-};
-
-END_LIBMATROSKA_NAMESPACE
+#include "matroska/KaxSemantic.h"
 
 #endif // LIBMATROSKA_CHAPTERS_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxCluster.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxCluster.h Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxClusterData.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxClusterData.h Changed

@@ -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.
 **
@@ -35,30 +35,6 @@
 #ifndef LIBMATROSKA_CLUSTER_DATA_H
 #define LIBMATROSKA_CLUSTER_DATA_H
 
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlMaster.h"
-#include "ebml/EbmlUInteger.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-DECLARE_MKX_UINTEGER(KaxClusterTimecode)
-};
-
-DECLARE_MKX_MASTER(KaxClusterSilentTracks)
-};
-
-DECLARE_MKX_UINTEGER(KaxClusterSilentTrackNumber)
-};
-
-DECLARE_MKX_UINTEGER(KaxClusterPosition)
-};
-
-DECLARE_MKX_UINTEGER(KaxClusterPrevSize)
-};
-
-END_LIBMATROSKA_NAMESPACE
+#include "matroska/KaxSemantic.h"
 
 #endif // LIBMATROSKA_CLUSTER_DATA_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxConfig.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxConfig.h Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxContentEncoding.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxContentEncoding.h Changed

@@ -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.
 **
@@ -30,66 +30,11 @@
 /*!
 	\file
 	\version \$Id: KaxContentEncoding.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
-	\author Moritz Bunkus <moritz @ bunkus.org>
+	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_CONTENT_ENCODING_H
 #define LIBMATROSKA_CONTENT_ENCODING_H
 
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlMaster.h"
-#include "ebml/EbmlUInteger.h"
-#include "ebml/EbmlBinary.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-DECLARE_MKX_MASTER(KaxContentEncodings)
-};
-
-DECLARE_MKX_MASTER(KaxContentEncoding)
-};
-
-DECLARE_MKX_UINTEGER(KaxContentEncodingOrder)
-};
-
-DECLARE_MKX_UINTEGER(KaxContentEncodingScope)
-};
-
-DECLARE_MKX_UINTEGER(KaxContentEncodingType)
-};
-
-DECLARE_MKX_MASTER(KaxContentCompression)
-};
-
-DECLARE_MKX_UINTEGER(KaxContentCompAlgo)
-};
-
-DECLARE_MKX_BINARY(KaxContentCompSettings)
-};
-
-DECLARE_MKX_MASTER(KaxContentEncryption)
-};
-
-DECLARE_MKX_UINTEGER(KaxContentEncAlgo)
-};
-
-DECLARE_MKX_BINARY(KaxContentEncKeyID)
-};
-
-DECLARE_MKX_BINARY(KaxContentSignature)
-};
-
-DECLARE_MKX_BINARY(KaxContentSigKeyID)
-};
-
-DECLARE_MKX_UINTEGER(KaxContentSigAlgo)
-};
-
-DECLARE_MKX_UINTEGER(KaxContentSigHashAlgo)
-};
-
-END_LIBMATROSKA_NAMESPACE
+#include "matroska/KaxSemantic.h"
 
 #endif // LIBMATROSKA_CONTENT_ENCODING_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxContexts.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxContexts.h Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxCues.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxCues.h Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxCuesData.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxCuesData.h Changed

@@ -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.
 **
@@ -61,45 +61,18 @@
 		bool Timecode(uint64 & aTimecode, uint64 GlobalTimecodeScale) const;
 };
 
-DECLARE_MKX_UINTEGER(KaxCueTime)
-};
-
 DECLARE_MKX_MASTER(KaxCueTrackPositions)
 	public:
 		uint64 ClusterPosition() const;
 		uint16 TrackNumber() const;
 };
 
-DECLARE_MKX_UINTEGER(KaxCueTrack)
-};
-
-DECLARE_MKX_UINTEGER(KaxCueClusterPosition)
-};
-
-DECLARE_MKX_UINTEGER(KaxCueBlockNumber)
-};
-
 #if MATROSKA_VERSION >= 2
-DECLARE_MKX_UINTEGER(KaxCueCodecState)
-};
-
 DECLARE_MKX_MASTER(KaxCueReference)
 	public:
 		void AddReference(const KaxBlockGroup & BlockReferenced, uint64 GlobalTimecodeScale);
 		void AddReference(const KaxBlockBlob & BlockReferenced, uint64 GlobalTimecodeScale);
 };
-
-DECLARE_MKX_UINTEGER(KaxCueRefTime)
-};
-
-DECLARE_MKX_UINTEGER(KaxCueRefCluster)
-};
-
-DECLARE_MKX_UINTEGER(KaxCueRefNumber)
-};
-
-DECLARE_MKX_UINTEGER(KaxCueRefCodecState)
-};
 #endif // MATROSKA_VERSION
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxDefines.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxDefines.h Changed

@@ -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.
 **
@@ -27,7 +27,7 @@
 
 /*!
 	\file
-	\version \$Id: KaxDefines.h 353 2010-06-27 05:24:02Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_DEFINES_H
@@ -42,6 +42,7 @@
 #define DEFINE_MKX_MASTER(a,b,c,d,e)         DEFINE_xxx_MASTER(a,b,d,e,EBML_SemanticGlobal)
 #define DEFINE_MKX_MASTER_ORPHAN(a,b,c,d)    DEFINE_xxx_MASTER_ORPHAN(a,b,d,EBML_SemanticGlobal)
 #define DEFINE_MKX_UINTEGER_DEF(a,b,c,d,e,v) DEFINE_xxx_UINTEGER_DEF(a,b,d,e,EBML_SemanticGlobal,v)
+#define DEFINE_MKX_SINTEGER_DEF(a,b,c,d,e,v) DEFINE_xxx_SINTEGER_DEF(a,b,d,e,EBML_SemanticGlobal,v)
 #define DEFINE_MKX_UINTEGER(a,b,c,d,e)       DEFINE_xxx_UINTEGER(a,b,d,e,EBML_SemanticGlobal)
 #define DEFINE_MKX_SINTEGER(a,b,c,d,e)       DEFINE_xxx_SINTEGER(a,b,d,e,EBML_SemanticGlobal)
 #define DEFINE_MKX_SINTEGER_CONS(a,b,c,d,e)  DEFINE_xxx_SINTEGER_CONS(a,b,d,e,EBML_SemanticGlobal)
@@ -130,6 +131,7 @@
 #define DEFINE_MKX_MASTER(a,b,c,d,e)         DEFINE_xxx_MASTER(a,b,c,d,e,*GetKaxGlobal_Context)
 #define DEFINE_MKX_MASTER_ORPHAN(a,b,c,d)    DEFINE_xxx_MASTER_ORPHAN(a,b,c,d,*GetKaxGlobal_Context)
 #define DEFINE_MKX_UINTEGER_DEF(a,b,c,d,e,v) DEFINE_xxx_UINTEGER_DEF(a,b,c,d,e,*GetKaxGlobal_Context,v)
+#define DEFINE_MKX_SINTEGER_DEF(a,b,c,d,e,v) DEFINE_xxx_SINTEGER_DEF(a,b,c,d,e,*GetKaxGlobal_Context,v)
 #define DEFINE_MKX_UINTEGER(a,b,c,d,e)       DEFINE_xxx_CLASS(a,b,c,d,e,*GetKaxGlobal_Context)
 #define DEFINE_MKX_SINTEGER(a,b,c,d,e)       DEFINE_xxx_CLASS(a,b,c,d,e,*GetKaxGlobal_Context)
 #define DEFINE_MKX_STRING_DEF(a,b,c,d,e,v)   DEFINE_xxx_STRING_DEF(a,b,c,d,e,*GetKaxGlobal_Context,v)

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxInfo.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxInfo.h Changed

@@ -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.
 **
@@ -35,24 +35,6 @@
 #ifndef LIBMATROSKA_INFO_H
 #define LIBMATROSKA_INFO_H
 
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlMaster.h"
-#include "ebml/EbmlUnicodeString.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-DECLARE_MKX_MASTER(KaxInfo)
-};
-
-DECLARE_MKX_UNISTRING(KaxMuxingApp)
-};
-
-DECLARE_MKX_UNISTRING(KaxWritingApp)
-};
-
-END_LIBMATROSKA_NAMESPACE
+#include "matroska/KaxSemantic.h"
 
 #endif // LIBMATROSKA_INFO_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxInfoData.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxInfoData.h Changed

@@ -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.
 **
@@ -29,7 +29,7 @@
 
 /*!
 	\file
-	\version \$Id: KaxInfoData.h 353 2010-06-27 05:24:02Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author John Cannon      <spyder2555 @ users.sf.net>
 	\author Moritz Bunkus    <moritz @ bunkus.org>
@@ -45,22 +45,12 @@
 #include "ebml/EbmlDate.h"
 #include "ebml/EbmlMaster.h"
 #include "matroska/KaxDefines.h"
+#include "matroska/KaxSemantic.h"
 
 using namespace LIBEBML_NAMESPACE;
 
 START_LIBMATROSKA_NAMESPACE
 
-DECLARE_MKX_BINARY(KaxSegmentUID)
-	public:
-#if defined(HAVE_EBML2) || defined(HAS_EBML2)
-        KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_PARAM);
-#endif
-		virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}
-};
-
-DECLARE_MKX_UNISTRING(KaxSegmentFilename)
-};
-
 DECLARE_MKX_CONTEXT(KaxPrevUID);
 class MATROSKA_DLL_API KaxPrevUID : public KaxSegmentUID {
 	public:
@@ -71,9 +61,6 @@
         EBML_CONCRETE_CLASS(KaxPrevUID)
 };
 
-DECLARE_MKX_UNISTRING(KaxPrevFilename)
-};
-
 DECLARE_MKX_CONTEXT(KaxNextUID);
 class MATROSKA_DLL_API KaxNextUID : public KaxSegmentUID {
 	public:
@@ -84,38 +71,6 @@
         EBML_CONCRETE_CLASS(KaxNextUID)
 };
 
-DECLARE_MKX_UNISTRING(KaxNextFilename)
-};
-
-DECLARE_MKX_BINARY(KaxSegmentFamily)
-	public:
-		virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}
-};
-
-DECLARE_MKX_MASTER(KaxChapterTranslate)
-};
-
-DECLARE_MKX_UINTEGER(KaxChapterTranslateCodec)
-};
-
-DECLARE_MKX_UINTEGER(KaxChapterTranslateEditionUID)
-};
-
-DECLARE_MKX_BINARY(KaxChapterTranslateID)
-};
-
-DECLARE_MKX_UINTEGER(KaxTimecodeScale)
-};
-
-DECLARE_MKX_FLOAT(KaxDuration)
-};
-
-DECLARE_MKX_DATE(KaxDateUTC)
-};
-
-DECLARE_MKX_UNISTRING(KaxTitle)
-};
-
 END_LIBMATROSKA_NAMESPACE
 
 #endif // LIBMATROSKA_INFO_DATA_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxSeekHead.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxSeekHead.h Changed

@@ -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.
 **
@@ -29,7 +29,7 @@
 
 /*!
 	\file
-	\version \$Id: KaxSeekHead.h 270 2010-05-25 12:02:30Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_SEEK_HEAD_H
@@ -46,7 +46,13 @@
 START_LIBMATROSKA_NAMESPACE
 
 class KaxSegment;
-class KaxSeek;
+
+DECLARE_MKX_MASTER(KaxSeek)
+	public:
+		int64 Location() const;
+		bool IsEbmlId(const EbmlId & aId) const;
+		bool IsEbmlId(const KaxSeek & aPoint) const;
+};
 
 DECLARE_MKX_MASTER(KaxSeekHead)
 	public:
@@ -60,21 +66,6 @@
 		KaxSeek * FindNextOf(const KaxSeek &aPrev) const;
 };
 
-DECLARE_MKX_MASTER(KaxSeek)
-	public:
-		int64 Location() const;
-		bool IsEbmlId(const EbmlId & aId) const;
-		bool IsEbmlId(const KaxSeek & aPoint) const;
-};
-
-DECLARE_MKX_BINARY(KaxSeekID)
-	public:
-		virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() <= 4;}
-};
-
-DECLARE_MKX_UINTEGER(KaxSeekPosition)
-};
-
 END_LIBMATROSKA_NAMESPACE
 
 #endif // LIBMATROSKA_SEEK_HEAD_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxSegment.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxSegment.h Changed

makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxSemantic.h Added

@@ -0,0 +1,741 @@
+/**********************************************************************
+**  DO NOT EDIT, GENERATED WITH DATA2LIB
+** 
+**  libmatroska : parse Matroska files, see http://www.matroska.org/
+** 
+**  Copyright (c) 2002-2010, Matroska (non-profit organisation)
+**  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.
+**
+**********************************************************************/
+
+
+#ifndef LIBMATROSKA_SEMANTIC_H
+#define LIBMATROSKA_SEMANTIC_H
+
+#include "matroska/KaxTypes.h"
+#include "ebml/EbmlUInteger.h"
+#include "ebml/EbmlSInteger.h"
+#include "ebml/EbmlDate.h"
+#include "ebml/EbmlFloat.h"
+#include "ebml/EbmlString.h"
+#include "ebml/EbmlUnicodeString.h"
+#include "ebml/EbmlBinary.h"
+#include "ebml/EbmlMaster.h"
+#include "matroska/KaxDefines.h"
+
+using namespace LIBEBML_NAMESPACE;
+
+START_LIBMATROSKA_NAMESPACE
+
+DECLARE_MKX_BINARY (KaxSeekID)
+public:
+	virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() <= 4;}
+};
+
+DECLARE_MKX_UINTEGER(KaxSeekPosition)
+};
+
+DECLARE_MKX_MASTER(KaxInfo)
+};
+
+
+DECLARE_MKX_BINARY (KaxSegmentUID)
+#if defined(HAVE_EBML2) || defined(HAS_EBML2)
+public:
+	KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_PARAM);
+#endif
+public:
+	virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
+};
+
+DECLARE_MKX_UNISTRING(KaxSegmentFilename)
+};
+
+DECLARE_MKX_UNISTRING(KaxPrevFilename)
+};
+
+DECLARE_MKX_UNISTRING(KaxNextFilename)
+};
+
+DECLARE_MKX_BINARY (KaxSegmentFamily)
+public:
+	virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
+};
+
+DECLARE_MKX_MASTER(KaxChapterTranslate)
+};
+
+
+DECLARE_MKX_UINTEGER(KaxChapterTranslateEditionUID)
+};
+
+DECLARE_MKX_UINTEGER(KaxChapterTranslateCodec)
+};
+
+DECLARE_MKX_BINARY (KaxChapterTranslateID)
+};
+
+DECLARE_MKX_UINTEGER(KaxTimecodeScale)
+};
+
+DECLARE_MKX_FLOAT(KaxDuration)
+};
+
+DECLARE_MKX_DATE    (KaxDateUTC)
+};
+
+DECLARE_MKX_UNISTRING(KaxTitle)
+};
+
+DECLARE_MKX_UNISTRING(KaxMuxingApp)
+};
+
+DECLARE_MKX_UNISTRING(KaxWritingApp)
+};
+
+DECLARE_MKX_UINTEGER(KaxClusterTimecode)
+};
+
+DECLARE_MKX_MASTER(KaxClusterSilentTracks)
+};
+
+
+DECLARE_MKX_UINTEGER(KaxClusterSilentTrackNumber)
+};
+
+DECLARE_MKX_UINTEGER(KaxClusterPosition)
+};
+
+DECLARE_MKX_UINTEGER(KaxClusterPrevSize)
+};
+
+DECLARE_MKX_MASTER(KaxBlockAdditions)
+};
+
+
+DECLARE_MKX_MASTER(KaxBlockMore)
+};
+
+
+DECLARE_MKX_UINTEGER(KaxBlockAddID)
+};
+
+DECLARE_MKX_BINARY (KaxBlockAdditional)
+};
+
+DECLARE_MKX_UINTEGER(KaxBlockDuration)
+};
+
+DECLARE_MKX_UINTEGER(KaxReferencePriority)
+};
+
+#if MATROSKA_VERSION >= 2
+DECLARE_MKX_SINTEGER(KaxReferenceVirtual)
+public:
+	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+};
+
+DECLARE_MKX_BINARY (KaxCodecState)
+};
+
+DECLARE_MKX_SINTEGER(KaxDiscardPadding)
+};
+#endif
+
+DECLARE_MKX_MASTER(KaxSlices)
+};
+
+
+DECLARE_MKX_MASTER(KaxTimeSlice)
+};
+
+
+DECLARE_MKX_UINTEGER(KaxSliceLaceNumber)
+};
+
+#if MATROSKA_VERSION >= 2
+DECLARE_MKX_UINTEGER(KaxSliceFrameNumber)
+public:
+	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+};
+
+DECLARE_MKX_UINTEGER(KaxSliceBlockAddID)
+public:
+	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+};
+
+DECLARE_MKX_UINTEGER(KaxSliceDelay)
+public:
+	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+};
+
+DECLARE_MKX_UINTEGER(KaxSliceDuration)
+public:
+	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+};
+
+DECLARE_MKX_MASTER(KaxReferenceFrame)
+};
+

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxTag.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxTag.h Changed

@@ -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.
 **
@@ -29,72 +29,12 @@
 
 /*!
 	\file
-	\version \$Id: KaxTag.h 385 2010-07-04 09:32:26Z robux4 $
-	\author Jory Stone     <jcsston @ toughguy.net>
+	\version \$Id$
 	\author Steve Lhomme   <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_TAG_H
 #define LIBMATROSKA_TAG_H
 
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlMaster.h"
-#include "ebml/EbmlFloat.h"
-#include "ebml/EbmlSInteger.h"
-#include "ebml/EbmlUInteger.h"
-#include "ebml/EbmlString.h"
-#include "ebml/EbmlUnicodeString.h"
-#include "ebml/EbmlBinary.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-DECLARE_MKX_MASTER(KaxTag)
-};
-
-DECLARE_MKX_MASTER(KaxTagTargets)
-};
-
-DECLARE_MKX_UINTEGER(KaxTagTargetTypeValue)
-};
-
-DECLARE_MKX_STRING(KaxTagTargetType)
-};
-
-DECLARE_MKX_UINTEGER(KaxTagTrackUID)
-};
-
-DECLARE_MKX_UINTEGER(KaxTagEditionUID)
-};
-
-DECLARE_MKX_UINTEGER(KaxTagChapterUID)
-};
-
-DECLARE_MKX_UINTEGER(KaxTagAttachmentUID)
-};
-
-DECLARE_MKX_STRING(KaxTagLanguage)
-};
-
-DECLARE_MKX_MASTER(KaxTagSimple)
-};
-
-DECLARE_MKX_UNISTRING(KaxTagName)
-};
-
-DECLARE_MKX_STRING(KaxTagLangue)
-};
-
-DECLARE_MKX_UINTEGER(KaxTagDefault)
-};
-
-DECLARE_MKX_UNISTRING(KaxTagString)
-};
-
-DECLARE_MKX_BINARY(KaxTagBinary)
-};
-
-END_LIBMATROSKA_NAMESPACE
+#include "matroska/KaxSemantic.h"
 
 #endif // LIBMATROSKA_TAG_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxTags.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxTags.h Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxTrackAudio.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxTrackAudio.h Changed

@@ -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.
 **
@@ -35,37 +35,6 @@
 #ifndef LIBMATROSKA_TRACK_AUDIO_H
 #define LIBMATROSKA_TRACK_AUDIO_H
 
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlMaster.h"
-#include "ebml/EbmlFloat.h"
-#include "ebml/EbmlUInteger.h"
-#include "ebml/EbmlBinary.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-DECLARE_MKX_MASTER(KaxTrackAudio)
-};
-
-DECLARE_MKX_FLOAT(KaxAudioSamplingFreq)
-};
-
-DECLARE_MKX_FLOAT(KaxAudioOutputSamplingFreq)
-};
-
-DECLARE_MKX_UINTEGER(KaxAudioChannels)
-};
-
-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_BINARY(KaxAudioPosition)
-};
-#endif // MATROSKA_VERSION
-
-DECLARE_MKX_UINTEGER(KaxAudioBitDepth)
-};
-
-END_LIBMATROSKA_NAMESPACE
+#include "matroska/KaxSemantic.h"
 
 #endif // LIBMATROSKA_TRACK_AUDIO_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxTrackEntryData.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxTrackEntryData.h Changed

@@ -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.
 **
@@ -31,109 +31,10 @@
 	\file
 	\version \$Id: KaxTrackEntryData.h,v 1.9 2004/04/14 23:26:17 robux4 Exp $
 	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author John Cannon      <spyder2555 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_TRACK_ENTRY_DATA_H
 #define LIBMATROSKA_TRACK_ENTRY_DATA_H
 
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlUInteger.h"
-#include "ebml/EbmlFloat.h"
-#include "ebml/EbmlString.h"
-#include "ebml/EbmlUnicodeString.h"
-#include "ebml/EbmlBinary.h"
-#include "ebml/EbmlMaster.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-DECLARE_MKX_UINTEGER(KaxTrackNumber)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackUID)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackType)
-};
-
-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_UINTEGER(KaxTrackFlagEnabled)
-};
-#endif // MATROSKA_VERSION
-
-DECLARE_MKX_UINTEGER(KaxTrackFlagDefault)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackFlagForced)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackFlagLacing)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackMinCache)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackMaxCache)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackDefaultDuration)
-};
-
-DECLARE_MKX_FLOAT(KaxTrackTimecodeScale)
-};
-
-DECLARE_MKX_UINTEGER(KaxMaxBlockAdditionID)
-};
-
-DECLARE_MKX_UNISTRING(KaxTrackName)
-};
-
-DECLARE_MKX_STRING(KaxTrackLanguage)
-};
-
-DECLARE_MKX_STRING(KaxCodecID)
-};
-
-DECLARE_MKX_BINARY(KaxCodecPrivate)
-};
-
-DECLARE_MKX_UNISTRING(KaxCodecName)
-};
-
-DECLARE_MKX_BINARY(KaxTrackAttachmentLink)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackOverlay)
-};
-
-DECLARE_MKX_MASTER(KaxTrackTranslate)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackTranslateCodec)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackTranslateEditionUID)
-};
-
-DECLARE_MKX_BINARY(KaxTrackTranslateTrackID)
-};
-
-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_UNISTRING(KaxCodecSettings)
-};
-
-DECLARE_MKX_STRING(KaxCodecInfoURL)
-};
-
-DECLARE_MKX_STRING(KaxCodecDownloadURL)
-};
-
-DECLARE_MKX_UINTEGER(KaxCodecDecodeAll)
-};
-#endif // MATROSKA_VERSION
-
-END_LIBMATROSKA_NAMESPACE
+#include "matroska/KaxSemantic.h"
 
 #endif // LIBMATROSKA_TRACK_ENTRY_DATA_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxTrackVideo.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxTrackVideo.h Changed

@@ -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.
 **
@@ -29,82 +29,12 @@
 
 /*!
 	\file
-	\version \$Id: KaxTrackVideo.h 270 2010-05-25 12:02:30Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_TRACK_VIDEO_H
 #define LIBMATROSKA_TRACK_VIDEO_H
 
-#include "matroska/KaxTypes.h"
-#include "ebml/EbmlMaster.h"
-#include "ebml/EbmlUInteger.h"
-#include "ebml/EbmlBinary.h"
-#include "ebml/EbmlFloat.h"
-#include "matroska/KaxDefines.h"
-
-using namespace LIBEBML_NAMESPACE;
-
-START_LIBMATROSKA_NAMESPACE
-
-DECLARE_MKX_MASTER(KaxTrackVideo)
-};
-
-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_UINTEGER(KaxVideoFlagInterlaced)
-};
-
-DECLARE_MKX_UINTEGER(KaxVideoStereoMode)
-};
-#endif // MATROSKA_VERSION
-
-DECLARE_MKX_UINTEGER(KaxVideoPixelWidth)
-};
-
-DECLARE_MKX_UINTEGER(KaxVideoPixelHeight)
-};
-
-DECLARE_MKX_UINTEGER(KaxVideoPixelCropBottom)
-};
-
-DECLARE_MKX_UINTEGER(KaxVideoPixelCropTop)
-};
-
-DECLARE_MKX_UINTEGER(KaxVideoPixelCropLeft)
-};
-
-DECLARE_MKX_UINTEGER(KaxVideoPixelCropRight)
-};
-
-DECLARE_MKX_UINTEGER(KaxVideoDisplayWidth)
-};
-
-DECLARE_MKX_UINTEGER(KaxVideoDisplayHeight)
-};
-
-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_UINTEGER(KaxVideoDisplayUnit)
-};
-
-DECLARE_MKX_UINTEGER(KaxVideoAspectRatio)
-};
-#endif // MATROSKA_VERSION
-
-DECLARE_MKX_BINARY(KaxVideoColourSpace)
-	public:
-        bool ValidateSize(void) const {return IsFiniteSize() && (GetSize() == 4);}
-};
-
-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_FLOAT(KaxVideoGamma)
-};
-#endif // MATROSKA_VERSION
-
-DECLARE_MKX_FLOAT(KaxVideoFrameRate)
-	public:
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
-};
-
-
-END_LIBMATROSKA_NAMESPACE
+#include "matroska/KaxSemantic.h"
 
 #endif // LIBMATROSKA_TRACK_VIDEO_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxTracks.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxTracks.h Changed

@@ -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.
 **
@@ -38,16 +38,13 @@
 #include "matroska/KaxTypes.h"
 #include "ebml/EbmlMaster.h"
 #include "ebml/EbmlUInteger.h"
-#include "matroska/KaxTrackEntryData.h"
 #include "matroska/KaxDefines.h"
+#include "matroska/KaxSemantic.h"
 
 using namespace LIBEBML_NAMESPACE;
 
 START_LIBMATROSKA_NAMESPACE
 
-DECLARE_MKX_MASTER(KaxTracks)
-};
-
 DECLARE_MKX_MASTER(KaxTrackEntry)
 	public:
 		EbmlUInteger & TrackNumber() const { return *(static_cast<EbmlUInteger *>(FindElt(EBML_INFO(KaxTrackNumber)))); }
@@ -76,29 +73,6 @@
 		uint64 mGlobalTimecodeScale;
 };
 
-#if MATROSKA_VERSION >= 2
-DECLARE_MKX_MASTER(KaxTrackOperation)
-};
-
-DECLARE_MKX_MASTER(KaxTrackCombinePlanes)
-};
-
-DECLARE_MKX_MASTER(KaxTrackPlane)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackPlaneUID)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackPlaneType)
-};
-
-DECLARE_MKX_MASTER(KaxTrackJoinBlocks)
-};
-
-DECLARE_MKX_UINTEGER(KaxTrackJoinUID)
-};
-#endif
-
 END_LIBMATROSKA_NAMESPACE
 
 #endif // LIBMATROSKA_TRACKS_H

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxTypes.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxTypes.h Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/KaxVersion.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/KaxVersion.h Changed

@@ -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.
 **
@@ -33,17 +33,17 @@
 #ifndef LIBMATROSKA_VERSION_H
 #define LIBMATROSKA_VERSION_H
 
-#include <string>
+#include <lgpl/stdstring.h>
 
 #include "ebml/EbmlConfig.h"
 #include "matroska/KaxConfig.h"
 
 START_LIBMATROSKA_NAMESPACE
 
-#define LIBMATROSKA_VERSION 0x010100
+#define LIBMATROSKA_VERSION 0x010401
 
-static const std::string KaxCodeVersion = "1.1.0";
-static const std::string KaxCodeDate    = __TIMESTAMP__;
+extern const ccc::string KaxCodeVersion;
+extern const ccc::string KaxCodeDate;
 
 /*!
 	\todo Improve the CRC/ECC system (backward and forward possible ?) to fit streaming/live writing/simple reading

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/c/libmatroska.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/c/libmatroska.h Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/inc/matroska/c/libmatroska_t.h -> makemkv-oss-1.8.7.tar.gz/libmatroska/inc/matroska/c/libmatroska_t.h Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/src/FileKax.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/FileKax.cpp Changed

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxAttached.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxAttached.cpp Changed

@@ -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.
 **
@@ -32,9 +32,9 @@
 	\version \$Id: KaxAttached.cpp 1202 2005-08-30 14:39:01Z robux4 $
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
-#include "matroska/KaxAttached.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxDefines.h"
+#include "matroska/KaxSemantic.h"
 
 // sub elements
 
@@ -42,27 +42,6 @@
 
 START_LIBMATROSKA_NAMESPACE
 
-DEFINE_START_SEMANTIC(KaxAttached)
-DEFINE_SEMANTIC_ITEM(true, true, KaxFileName)
-DEFINE_SEMANTIC_ITEM(true, true, KaxMimeType)
-DEFINE_SEMANTIC_ITEM(true, true, KaxFileData)
-DEFINE_SEMANTIC_ITEM(false, true, KaxFileDescription)
-DEFINE_SEMANTIC_ITEM(true, true, KaxFileUID)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxFileReferral)
-#endif // MATROSKA_VERSION
-DEFINE_END_SEMANTIC(KaxAttached)
-
-DEFINE_MKX_MASTER_CONS(KaxAttached,        0x61A7, 2, KaxAttachments, "AttachedFile");
-DEFINE_MKX_UNISTRING  (KaxFileDescription, 0x467E, 2, KaxAttachments, "FileDescription");
-DEFINE_MKX_UNISTRING  (KaxFileName,        0x466E, 2, KaxAttachments, "FileName");
-DEFINE_MKX_STRING     (KaxMimeType,        0x4660, 2, KaxAttachments, "FileMimeType");
-DEFINE_MKX_BINARY     (KaxFileData,        0x465C, 2, KaxAttachments, "FileData");
-DEFINE_MKX_UINTEGER   (KaxFileUID,         0x46AE, 2, KaxAttachments, "FileUID");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_BINARY     (KaxFileReferral,    0x4675, 2, KaxAttachments, "FileReferral");
-#endif
-
 KaxAttached::KaxAttached(EBML_EXTRA_DEF)
  :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxAttached) EBML_DEF_SEP EBML_EXTRA_CALL)
 {

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxAttachments.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxAttachments.cpp Changed

@@ -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.
 **
@@ -32,22 +32,15 @@
 	\version \$Id: KaxAttachments.cpp 640 2004-07-09 21:05:36Z mosu $
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
-#include "matroska/KaxAttachments.h"
-#include "matroska/KaxAttached.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxDefines.h"
+#include "matroska/KaxSemantic.h"
 
 using namespace LIBEBML_NAMESPACE;
 
 // sub elements
 START_LIBMATROSKA_NAMESPACE
 
-DEFINE_START_SEMANTIC(KaxAttachments)
-DEFINE_SEMANTIC_ITEM(true, false, KaxAttached)        ///< EBMLVersion
-DEFINE_END_SEMANTIC(KaxAttachments)
-
-DEFINE_MKX_MASTER_CONS(KaxAttachments, 0x1941A469, 4, KaxSegment, "Attachments");
-
 KaxAttachments::KaxAttachments(EBML_EXTRA_DEF)
  :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxAttachments) EBML_DEF_SEP EBML_EXTRA_CALL)
 {

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxBlock.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxBlock.cpp Changed

@@ -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.
 **
@@ -43,45 +43,6 @@
 
 START_LIBMATROSKA_NAMESPACE
 
-DEFINE_START_SEMANTIC(KaxBlockGroup)
-DEFINE_SEMANTIC_ITEM(true, true, KaxBlock)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxBlockVirtual)
-#endif // MATROSKA_VERSION
-DEFINE_SEMANTIC_ITEM(false, true, KaxBlockDuration)
-DEFINE_SEMANTIC_ITEM(false, true, KaxSlices)
-DEFINE_SEMANTIC_ITEM(true, true, KaxReferencePriority)
-DEFINE_SEMANTIC_ITEM(false, false, KaxReferenceBlock)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxReferenceVirtual)
-DEFINE_SEMANTIC_ITEM(false, true, KaxCodecState)
-#endif // MATROSKA_VERSION
-DEFINE_SEMANTIC_ITEM(false, true, KaxBlockAdditions)
-DEFINE_END_SEMANTIC(KaxBlockGroup)
-
-DEFINE_START_SEMANTIC(KaxBlockAdditions)
-DEFINE_SEMANTIC_ITEM(true,  false,  KaxBlockMore)
-DEFINE_END_SEMANTIC(KaxBlockAdditions)
-
-DEFINE_START_SEMANTIC(KaxBlockMore)
-DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAddID)
-DEFINE_SEMANTIC_ITEM(true,  true,  KaxBlockAdditional)
-DEFINE_END_SEMANTIC(KaxBlockMore)
-
-DEFINE_MKX_MASTER_CONS (KaxBlockGroup,       0xA0, 1, KaxCluster, "BlockGroup");
-DEFINE_MKX_BINARY_CONS (KaxBlock,            0xA1, 1, KaxBlockGroup, "Block");
-DEFINE_MKX_UINTEGER    (KaxBlockDuration,    0x9B, 1, KaxBlockGroup, "BlockDuration");
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_BINARY_CONS (KaxSimpleBlock,      0xA3, 1, KaxCluster, "SimpleBlock");
-DEFINE_MKX_BINARY_CONS (KaxBlockVirtual,     0xA2, 1, KaxBlockGroup, "BlockVirtual");
-DEFINE_MKX_BINARY      (KaxCodecState,       0xA4, 1, KaxBlockGroup, "CodecState");
-#endif
-DEFINE_MKX_MASTER      (KaxBlockAdditions, 0x75A1, 2, KaxBlockGroup, "BlockAdditions");
-DEFINE_MKX_MASTER      (KaxBlockMore,        0xA6, 1, KaxBlockAdditions, "BlockMore");
-DEFINE_MKX_UINTEGER_DEF(KaxBlockAddID,       0xEE, 1, KaxBlockMore, "BlockAddID", 1);
-DEFINE_MKX_BINARY      (KaxBlockAdditional,  0xA5, 1, KaxBlockMore, "BlockAdditional");
-
-
 DataBuffer * DataBuffer::Clone()
 {
 	binary *ClonedData = (binary *)malloc(mySize * sizeof(binary));
@@ -200,7 +161,7 @@
 		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
@@ -277,7 +238,7 @@
         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();
@@ -307,7 +268,7 @@
 	\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;
@@ -1075,4 +1036,12 @@
 	Block.group = &BlockRef;
 }
 
+#ifndef EBML_NO_READ
+filepos_t KaxBlockVirtual::ReadData(IOCallback & input, ScopeMode /* ReadFully */)
+{
+    input.setFilePointer(SizePosition + CodedSizeLength(Size, SizeLength, bSizeIsFinite) + Size, seek_beginning);
+    return GetSize();
+}
+#endif // EBML_NO_READ
+
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxBlockData.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxBlockData.cpp Changed

@@ -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.
 **
@@ -36,37 +36,12 @@
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxBlock.h"
 #include "matroska/KaxDefines.h"
+#include "matroska/KaxSemantic.h"
 
 using namespace LIBEBML_NAMESPACE;
 
 START_LIBMATROSKA_NAMESPACE
 
-DEFINE_START_SEMANTIC(KaxSlices)
-DEFINE_SEMANTIC_ITEM(false, false, KaxTimeSlice)
-DEFINE_END_SEMANTIC(KaxSlices)
-
-DEFINE_START_SEMANTIC(KaxTimeSlice)
-DEFINE_SEMANTIC_ITEM(false, true, KaxSliceLaceNumber)
-DEFINE_SEMANTIC_ITEM(false, true, KaxSliceFrameNumber)
-DEFINE_SEMANTIC_ITEM(false, true, KaxSliceBlockAddID)
-DEFINE_SEMANTIC_ITEM(false, true, KaxSliceDelay)
-DEFINE_SEMANTIC_ITEM(false, true, KaxSliceDuration)
-DEFINE_END_SEMANTIC(KaxTimeSlice)
-
-DEFINE_MKX_UINTEGER_DEF (KaxReferencePriority, 0xFA, 1, KaxBlockGroup, "FlagReferenced", 0);
-DEFINE_MKX_SINTEGER_CONS(KaxReferenceBlock,    0xFB, 1, KaxBlockGroup, "ReferenceBlock");
-DEFINE_MKX_MASTER       (KaxSlices,            0x8E, 1, KaxBlockGroup, "Slices");
-DEFINE_MKX_MASTER       (KaxTimeSlice,         0xE8, 1, KaxSlices, "TimeSlice");
-DEFINE_MKX_UINTEGER_DEF (KaxSliceLaceNumber,   0xCC, 1, KaxTimeSlice, "SliceLaceNumber", 0);
-DEFINE_MKX_UINTEGER_DEF (KaxSliceFrameNumber,  0xCD, 1, KaxTimeSlice, "SliceFrameNumber", 0);
-DEFINE_MKX_UINTEGER_DEF (KaxSliceBlockAddID,   0xCB, 1, KaxTimeSlice, "SliceBlockAddID", 0);
-DEFINE_MKX_UINTEGER     (KaxSliceDelay,        0xCE, 1, KaxTimeSlice, "SliceDelay");
-DEFINE_MKX_UINTEGER_DEF (KaxSliceDuration,     0xCF, 1, KaxTimeSlice, "SliceDuration", 0);
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_SINTEGER     (KaxReferenceVirtual,  0xFD, 1, KaxBlockGroup, "ReferenceVirtual");
-#endif
-
-
 const KaxBlockBlob & KaxReferenceBlock::RefBlock() const
 {
 	assert(RefdBlock != NULL);
@@ -77,12 +52,16 @@
 :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)
 {

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxCluster.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxCluster.cpp Changed

@@ -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.
 **
@@ -31,7 +31,6 @@
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "matroska/KaxCluster.h"
-#include "matroska/KaxClusterData.h"
 #include "matroska/KaxBlock.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxSegment.h"
@@ -40,19 +39,6 @@
 // sub elements
 START_LIBMATROSKA_NAMESPACE
 
-DEFINE_START_SEMANTIC(KaxCluster)
-DEFINE_SEMANTIC_ITEM(true, true, KaxClusterTimecode)
-DEFINE_SEMANTIC_ITEM(false, true, KaxClusterSilentTracks)
-DEFINE_SEMANTIC_ITEM(false, true, KaxClusterPrevSize)
-DEFINE_SEMANTIC_ITEM(false, false, KaxBlockGroup)
-#if MATROSKA_VERSION == 2
-DEFINE_SEMANTIC_ITEM(false, false, KaxSimpleBlock)
-#endif
-DEFINE_SEMANTIC_ITEM(false, true, KaxClusterPosition)
-DEFINE_END_SEMANTIC(KaxCluster)
-
-DEFINE_MKX_MASTER_CONS(KaxCluster, 0x1F43B675, 4, KaxSegment, "Cluster");
-
 KaxCluster::KaxCluster(EBML_EXTRA_DEF)
 	:EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxCluster) EBML_DEF_SEP EBML_EXTRA_CALL)
 	,currentNewBlock(NULL)
@@ -112,7 +98,6 @@
 	if (currentNewBlock == NULL || uint32(track.TrackNumber()) != uint32(currentNewBlock->TrackNumber()) || PastBlock != NULL || ForwBlock != NULL) {
 		KaxBlockGroup & aNewBlock = GetNewBlock();
 		MyNewBlock = currentNewBlock = &aNewBlock;
-		currentNewBlock = &aNewBlock;
 	}
 
 	if (PastBlock != NULL) {

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxContexts.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxContexts.cpp Changed

@@ -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.
 **
@@ -33,9 +33,8 @@
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "ebml/EbmlContexts.h"
+#include "ebml/EbmlHead.h"
 #include "matroska/KaxContexts.h"
-#include "matroska/KaxAttached.h"
-#include "matroska/KaxAttachments.h"
 #include "matroska/KaxBlock.h"
 #include "matroska/KaxCluster.h"
 #include "matroska/KaxSegment.h"
@@ -45,6 +44,13 @@
 
 START_LIBMATROSKA_NAMESPACE
 
+DEFINE_START_SEMANTIC(KaxMatroska)
+DEFINE_SEMANTIC_ITEM(true, true, EbmlHead)
+DEFINE_SEMANTIC_ITEM(false, false, KaxSegment)
+DEFINE_END_SEMANTIC(KaxMatroska)
+
+DEFINE_MKX_CONTEXT(KaxMatroska)
+
 DEFINE_SEMANTIC_CONTEXT(KaxSegment)
 DEFINE_SEMANTIC_CONTEXT(KaxAttached)
 DEFINE_SEMANTIC_CONTEXT(KaxAttachments)

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxCues.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxCues.cpp Changed

@@ -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.
 **
@@ -37,16 +37,11 @@
 #include "matroska/KaxContexts.h"
 #include "ebml/EbmlStream.h"
 #include "matroska/KaxDefines.h"
+#include "matroska/KaxSemantic.h"
 
 // sub elements
 START_LIBMATROSKA_NAMESPACE
 
-DEFINE_START_SEMANTIC(KaxCues) 
-DEFINE_SEMANTIC_ITEM(true, false, KaxCuePoint)
-DEFINE_END_SEMANTIC(KaxCues) 
-
-DEFINE_MKX_MASTER(KaxCues, 0x1C53BB6B, 4, KaxSegment, "Cues");
-
 KaxCues::~KaxCues()
 {
 	assert(myTempReferences.size() == 0); // otherwise that means you have added references and forgot to set the position
@@ -75,7 +70,7 @@
 	// Do not add the element if it's already present.
 	std::vector<const KaxBlockBlob *>::iterator ListIdx;
 
-	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ListIdx++)
+	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx)
 		if (*ListIdx == &BlockReference)
 			return true;
 
@@ -88,7 +83,7 @@
 	// look for the element in the temporary references
 	std::vector<const KaxBlockBlob *>::iterator ListIdx;
 
-	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ListIdx++) {
+	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx) {
 		if (*ListIdx == &BlockReference) {
 			// found, now add the element to the entry list
 			KaxCuePoint & NewPoint = AddNewChild<KaxCuePoint>(*this);
@@ -104,7 +99,7 @@
 	// look for the element in the temporary references
 	std::vector<const KaxBlockBlob *>::iterator ListIdx;
 
-	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ListIdx++) {
+	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx) {
 		const KaxInternalBlock &refTmp = **ListIdx;
 		if (refTmp.GlobalTimecode() == BlockRef.GlobalTimecode() &&
 			refTmp.TrackNum() == BlockRef.TrackNumber()) {
@@ -125,7 +120,6 @@
 	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;
@@ -144,7 +138,6 @@
 				}
 				if (_Time < aNextTime && _Time > TimecodeToLocate) {
 					aNextTime= _Time;
-					aPointNext = tmp;
 				}
 			}
 		}

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxCuesData.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxCuesData.cpp Changed

@@ -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.
 **
@@ -39,48 +39,10 @@
 #include "matroska/KaxCluster.h"
 #include "matroska/KaxSegment.h"
 #include "matroska/KaxDefines.h"
+#include "matroska/KaxSemantic.h"
 
 START_LIBMATROSKA_NAMESPACE
 
-DEFINE_START_SEMANTIC(KaxCuePoint)
-DEFINE_SEMANTIC_ITEM(true, true, KaxCueTime)
-DEFINE_SEMANTIC_ITEM(true, false, KaxCueTrackPositions)
-DEFINE_END_SEMANTIC(KaxCuePoint)
-
-DEFINE_START_SEMANTIC(KaxCueTrackPositions)
-DEFINE_SEMANTIC_ITEM(true, true, KaxCueTrack)
-DEFINE_SEMANTIC_ITEM(true, true, KaxCueClusterPosition)
-DEFINE_SEMANTIC_ITEM(false, true, KaxCueBlockNumber)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxCueCodecState)
-DEFINE_SEMANTIC_ITEM(false, false, KaxCueReference)
-#endif // MATROSKA_VERSION
-DEFINE_END_SEMANTIC(KaxCueTrackPositions)
-
-#if MATROSKA_VERSION >= 2
-DEFINE_START_SEMANTIC(KaxCueReference)
-DEFINE_SEMANTIC_ITEM(true, true, KaxCueRefTime)
-DEFINE_SEMANTIC_ITEM(true, true, KaxCueRefCluster)
-DEFINE_SEMANTIC_ITEM(false, true, KaxCueRefNumber)
-DEFINE_SEMANTIC_ITEM(false, true, KaxCueRefCodecState)
-DEFINE_END_SEMANTIC(KaxCueReference)
-#endif // MATROSKA_VERSION
-
-DEFINE_MKX_MASTER      (KaxCuePoint,           0xBB, 1, KaxCues, "CuePoint");
-DEFINE_MKX_UINTEGER    (KaxCueTime,            0xB3, 1, KaxCuePoint, "CueTime");
-DEFINE_MKX_MASTER      (KaxCueTrackPositions,  0xB7, 1, KaxCuePoint, "CueTrackPositions");
-DEFINE_MKX_UINTEGER    (KaxCueTrack,           0xF7, 1, KaxCueTrackPositions, "CueTrack");
-DEFINE_MKX_UINTEGER    (KaxCueClusterPosition, 0xF1, 1, KaxCueTrackPositions, "CueClusterPosition");
-DEFINE_MKX_UINTEGER_DEF(KaxCueBlockNumber,   0x5378, 2, KaxCueTrackPositions, "CueBlockNumber", 1);
-#if MATROSKA_VERSION >= 2
-DEFINE_MKX_UINTEGER_DEF(KaxCueCodecState,      0xEA, 1, KaxCueTrackPositions, "CueCodecState", 0);
-DEFINE_MKX_MASTER      (KaxCueReference,       0xDB, 1, KaxCueTrackPositions, "CueReference");
-DEFINE_MKX_UINTEGER    (KaxCueRefTime,         0x96, 1, KaxCueReference, "CueRefTime");
-DEFINE_MKX_UINTEGER    (KaxCueRefCluster,      0x97, 1, KaxCueRefTime, "CueRefCluster");
-DEFINE_MKX_UINTEGER_DEF(KaxCueRefNumber,     0x535F, 2, KaxCueRefTime, "CueRefNumber", 1);
-DEFINE_MKX_UINTEGER_DEF(KaxCueRefCodecState,   0xEB, 1, KaxCueRefTime, "CueRefCodecState", 0);
-#endif
-
 /*!
 	\todo handle codec state checking
 	\todo remove duplicate references (reference to 2 frames that each reference the same frame)

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxInfoData.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxInfoData.cpp Changed

@@ -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.
 **
@@ -29,38 +29,17 @@
 
 /*!
 	\file
-	\version \$Id: KaxInfoData.cpp 353 2010-06-27 05:24:02Z robux4 $
+	\version \$Id$
 	\author Steve Lhomme     <robux4 @ users.sf.net>
 	\author John Cannon      <spyder2555 @ users.sf.net>
 */
 #include "matroska/KaxInfoData.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxDefines.h"
+#include "matroska/KaxSemantic.h"
 
 START_LIBMATROSKA_NAMESPACE
 
-DEFINE_START_SEMANTIC(KaxChapterTranslate)
-DEFINE_SEMANTIC_ITEM(false, false, KaxChapterTranslateEditionUID)
-DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTranslateCodec)
-DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTranslateID)
-DEFINE_END_SEMANTIC(KaxChapterTranslate)
-
-DEFINE_MKX_BINARY       (KaxSegmentUID,                 0x73A4, 2, KaxInfo, "SegmentUID");
-DEFINE_MKX_UNISTRING    (KaxSegmentFilename,            0x7384, 2, KaxInfo, "SegmentFilename");
-DEFINE_MKX_BINARY_CONS  (KaxPrevUID,                  0x3CB923, 3, KaxInfo, "PrevUID");
-DEFINE_MKX_UNISTRING    (KaxPrevFilename,             0x3C83AB, 3, KaxInfo, "PrevFilename");
-DEFINE_MKX_BINARY_CONS  (KaxNextUID,                  0x3EB923, 3, KaxInfo, "NextUID");
-DEFINE_MKX_UNISTRING    (KaxNextFilename,             0x3E83BB, 3, KaxInfo, "NextFilename");
-DEFINE_MKX_BINARY       (KaxSegmentFamily,              0x4444, 2, KaxInfo, "SegmentFamily");
-DEFINE_MKX_MASTER       (KaxChapterTranslate,           0x6924, 2, KaxInfo, "ChapterTranslate");
-DEFINE_MKX_UINTEGER     (KaxChapterTranslateEditionUID, 0x69FC, 2, KaxChapterTranslate, "ChapterTranslateEditionUID");
-DEFINE_MKX_UINTEGER     (KaxChapterTranslateCodec,      0x69BF, 2, KaxChapterTranslate, "ChapterTranslateCodec");
-DEFINE_MKX_BINARY       (KaxChapterTranslateID,         0x69A5, 2, KaxChapterTranslate, "ChapterTranslateID");
-DEFINE_MKX_UINTEGER_DEF(KaxTimecodeScale,            0x2AD7B1, 3, KaxInfo, "TimecodeScale", 1000000);
-DEFINE_MKX_FLOAT        (KaxDuration,                   0x4489, 2, KaxInfo, "Duration");
-DEFINE_MKX_DATE         (KaxDateUTC,                    0x4461, 2, KaxInfo, "DateUTC");
-DEFINE_MKX_UNISTRING    (KaxTitle,                      0x7BA9, 2, KaxInfo, "Title");
-
 KaxPrevUID::KaxPrevUID(EBML_EXTRA_DEF)
 :KaxSegmentUID(EBML_DEF_BINARY_CTX(KaxPrevUID) EBML_DEF_SEP EBML_EXTRA_CALL)
 {

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxSeekHead.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxSeekHead.cpp Changed

@@ -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.
 **
@@ -43,20 +43,6 @@
 // sub elements
 START_LIBMATROSKA_NAMESPACE
 
-DEFINE_START_SEMANTIC(KaxSeekHead)
-DEFINE_SEMANTIC_ITEM(true, false, KaxSeek)
-DEFINE_END_SEMANTIC(KaxSeekHead)
-
-DEFINE_START_SEMANTIC(KaxSeek) 
-DEFINE_SEMANTIC_ITEM(true, true, KaxSeekID)
-DEFINE_SEMANTIC_ITEM(true, true, KaxSeekPosition)
-DEFINE_END_SEMANTIC(KaxSeek) 
-
-DEFINE_MKX_MASTER  (KaxSeekHead, 0x114D9B74, 4, KaxSegment, "SeekHeader");
-DEFINE_MKX_MASTER  (KaxSeek,         0x4DBB, 2, KaxSeekHead, "SeekPoint");
-DEFINE_MKX_BINARY  (KaxSeekID,       0x53AB, 2, KaxSeek, "SeekID");
-DEFINE_MKX_UINTEGER(KaxSeekPosition, 0x53AC, 2, KaxSeek, "SeekPosition");
-
 /*!
 	\todo verify that the element is not already in the list
 */

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxSegment.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxSegment.cpp Changed

@@ -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.
 **
@@ -40,35 +40,11 @@
 #include "matroska/KaxSeekHead.h"
 #include "matroska/KaxCues.h"
 #include "matroska/KaxTracks.h"
-#include "matroska/KaxInfo.h"
-#include "matroska/KaxChapters.h"
-#include "matroska/KaxAttachments.h"
-#include "matroska/KaxTags.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxDefines.h"
 
 START_LIBMATROSKA_NAMESPACE
 
-DEFINE_START_SEMANTIC(KaxMatroska)
-DEFINE_SEMANTIC_ITEM(true, true, EbmlHead)
-DEFINE_SEMANTIC_ITEM(true, false, KaxSegment)
-DEFINE_END_SEMANTIC(KaxMatroska)
-
-DEFINE_START_SEMANTIC(KaxSegment)
-DEFINE_SEMANTIC_ITEM(false, false, KaxCluster)
-DEFINE_SEMANTIC_ITEM(false, false, KaxSeekHead)
-DEFINE_SEMANTIC_ITEM(false, true, KaxCues)
-DEFINE_SEMANTIC_ITEM(false, false, KaxTracks)
-DEFINE_SEMANTIC_ITEM(true, true, KaxInfo)
-DEFINE_SEMANTIC_ITEM(false, true, KaxChapters)
-DEFINE_SEMANTIC_ITEM(false, true, KaxAttachments)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTags)
-DEFINE_END_SEMANTIC(KaxSegment)
-
-DEFINE_MKX_CONTEXT(KaxMatroska);
-
-DEFINE_MKX_MASTER_ORPHAN(KaxSegment, 0x18538067, 4, "Segment\0rotomopogo");
-
 KaxSegment::KaxSegment(EBML_EXTRA_DEF)
 	:EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxSegment) EBML_DEF_SEP EBML_EXTRA_CALL)
 {

makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxSemantic.cpp Added

@@ -0,0 +1,801 @@
+/**********************************************************************
+**  DO NOT EDIT, GENERATED WITH DATA2LIB
+** 
+**  libmatroska : parse Matroska files, see http://www.matroska.org/
+** 
+**  Copyright (c) 2002-2010, Matroska (non-profit organisation)
+**  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.
+**
+**********************************************************************/
+
+#include "matroska/KaxContexts.h"
+#include "matroska/KaxSemantic.h"
+#include "matroska/KaxSegment.h"
+#include "matroska/KaxSeekHead.h"
+#include "matroska/KaxCluster.h"
+#include "matroska/KaxTracks.h"
+#include "matroska/KaxCues.h"
+#include "matroska/KaxInfoData.h"
+#include "matroska/KaxBlockData.h"
+#include "matroska/KaxCuesData.h"
+
+START_LIBMATROSKA_NAMESPACE
+
+DEFINE_START_SEMANTIC(KaxSegment)
+DEFINE_SEMANTIC_ITEM(false, false, KaxSeekHead)
+DEFINE_SEMANTIC_ITEM(true, false, KaxInfo)
+DEFINE_SEMANTIC_ITEM(false, false, KaxCluster)
+DEFINE_SEMANTIC_ITEM(false, false, KaxTracks)
+DEFINE_SEMANTIC_ITEM(false, true, KaxCues)
+DEFINE_SEMANTIC_ITEM(false, true, KaxAttachments)
+DEFINE_SEMANTIC_ITEM(false, true, KaxChapters)
+DEFINE_SEMANTIC_ITEM(false, false, KaxTags)
+DEFINE_END_SEMANTIC(KaxSegment)
+
+DEFINE_MKX_MASTER_ORPHAN(KaxSegment, 0x18538067, 4, "Segment");
+
+DEFINE_START_SEMANTIC(KaxSeekHead)
+DEFINE_SEMANTIC_ITEM(true, false, KaxSeek)
+DEFINE_END_SEMANTIC(KaxSeekHead)
+
+DEFINE_MKX_MASTER(KaxSeekHead, 0x114D9B74, 4, KaxSegment, "SeekHeader");
+
+DEFINE_START_SEMANTIC(KaxSeek)
+DEFINE_SEMANTIC_ITEM(true, true, KaxSeekID)
+DEFINE_SEMANTIC_ITEM(true, true, KaxSeekPosition)
+DEFINE_END_SEMANTIC(KaxSeek)
+
+DEFINE_MKX_MASTER(KaxSeek, 0x4DBB, 2, KaxSeekHead, "SeekPoint");
+DEFINE_MKX_BINARY (KaxSeekID, 0x53AB, 2, KaxSeek, "SeekID");
+DEFINE_MKX_UINTEGER(KaxSeekPosition, 0x53AC, 2, KaxSeek, "SeekPosition");
+
+DEFINE_START_SEMANTIC(KaxInfo)
+DEFINE_SEMANTIC_ITEM(false, true, KaxSegmentUID)
+DEFINE_SEMANTIC_ITEM(false, true, KaxSegmentFilename)
+DEFINE_SEMANTIC_ITEM(false, true, KaxPrevUID)
+DEFINE_SEMANTIC_ITEM(false, true, KaxPrevFilename)
+DEFINE_SEMANTIC_ITEM(false, true, KaxNextUID)
+DEFINE_SEMANTIC_ITEM(false, true, KaxNextFilename)
+DEFINE_SEMANTIC_ITEM(false, false, KaxSegmentFamily)
+DEFINE_SEMANTIC_ITEM(false, false, KaxChapterTranslate)
+DEFINE_SEMANTIC_ITEM(true, true, KaxTimecodeScale)
+DEFINE_SEMANTIC_ITEM(false, true, KaxDuration)
+DEFINE_SEMANTIC_ITEM(false, true, KaxDateUTC)
+DEFINE_SEMANTIC_ITEM(false, true, KaxTitle)
+DEFINE_SEMANTIC_ITEM(true, true, KaxMuxingApp)
+DEFINE_SEMANTIC_ITEM(true, true, KaxWritingApp)
+DEFINE_END_SEMANTIC(KaxInfo)
+
+DEFINE_MKX_MASTER(KaxInfo, 0x1549A966, 4, KaxSegment, "Info");
+DEFINE_MKX_BINARY (KaxSegmentUID, 0x73A4, 2, KaxInfo, "SegmentUID");
+DEFINE_MKX_UNISTRING(KaxSegmentFilename, 0x7384, 2, KaxInfo, "SegmentFilename");
+DEFINE_MKX_BINARY_CONS(KaxPrevUID, 0x3CB923, 3, KaxInfo, "PrevUID");
+DEFINE_MKX_UNISTRING(KaxPrevFilename, 0x3C83AB, 3, KaxInfo, "PrevFilename");
+DEFINE_MKX_BINARY_CONS(KaxNextUID, 0x3EB923, 3, KaxInfo, "NextUID");
+DEFINE_MKX_UNISTRING(KaxNextFilename, 0x3E83BB, 3, KaxInfo, "NextFilename");
+DEFINE_MKX_BINARY (KaxSegmentFamily, 0x4444, 2, KaxInfo, "SegmentFamily");
+
+DEFINE_START_SEMANTIC(KaxChapterTranslate)
+DEFINE_SEMANTIC_ITEM(false, false, KaxChapterTranslateEditionUID)
+DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTranslateCodec)
+DEFINE_SEMANTIC_ITEM(true, true, KaxChapterTranslateID)
+DEFINE_END_SEMANTIC(KaxChapterTranslate)
+
+DEFINE_MKX_MASTER(KaxChapterTranslate, 0x6924, 2, KaxInfo, "ChapterTranslate");
+DEFINE_MKX_UINTEGER(KaxChapterTranslateEditionUID, 0x69FC, 2, KaxChapterTranslate, "ChapterTranslateEditionUID");
+DEFINE_MKX_UINTEGER(KaxChapterTranslateCodec, 0x69BF, 2, KaxChapterTranslate, "ChapterTranslateCodec");
+DEFINE_MKX_BINARY (KaxChapterTranslateID, 0x69A5, 2, KaxChapterTranslate, "ChapterTranslateID");
+DEFINE_MKX_UINTEGER_DEF(KaxTimecodeScale, 0x2AD7B1, 3, KaxInfo, "TimecodeScale", 1000000);
+DEFINE_MKX_FLOAT(KaxDuration, 0x4489, 2, KaxInfo, "Duration");
+DEFINE_MKX_DATE    (KaxDateUTC, 0x4461, 2, KaxInfo, "DateUTC");
+DEFINE_MKX_UNISTRING(KaxTitle, 0x7BA9, 2, KaxInfo, "Title");
+DEFINE_MKX_UNISTRING(KaxMuxingApp, 0x4D80, 2, KaxInfo, "MuxingApp");
+DEFINE_MKX_UNISTRING(KaxWritingApp, 0x5741, 2, KaxInfo, "WritingApp");
+
+DEFINE_START_SEMANTIC(KaxCluster)
+DEFINE_SEMANTIC_ITEM(true, true, KaxClusterTimecode)
+DEFINE_SEMANTIC_ITEM(false, true, KaxClusterSilentTracks)
+DEFINE_SEMANTIC_ITEM(false, true, KaxClusterPosition)
+DEFINE_SEMANTIC_ITEM(false, true, KaxClusterPrevSize)
+#if MATROSKA_VERSION >= 2
+DEFINE_SEMANTIC_ITEM(false, false, KaxSimpleBlock)
+#endif // MATROSKA_VERSION
+DEFINE_SEMANTIC_ITEM(false, false, KaxBlockGroup)
+#if MATROSKA_VERSION >= 2
+DEFINE_SEMANTIC_ITEM(false, false, KaxEncryptedBlock) // not supported
+#endif // MATROSKA_VERSION
+DEFINE_END_SEMANTIC(KaxCluster)
+
+DEFINE_MKX_MASTER_CONS(KaxCluster, 0x1F43B675, 4, KaxSegment, "Cluster");
+DEFINE_MKX_UINTEGER(KaxClusterTimecode, 0xE7, 1, KaxCluster, "ClusterTimecode");
+
+DEFINE_START_SEMANTIC(KaxClusterSilentTracks)
+DEFINE_SEMANTIC_ITEM(false, false, KaxClusterSilentTrackNumber)
+DEFINE_END_SEMANTIC(KaxClusterSilentTracks)
+
+DEFINE_MKX_MASTER(KaxClusterSilentTracks, 0x5854, 2, KaxCluster, "ClusterSilentTracks");
+DEFINE_MKX_UINTEGER(KaxClusterSilentTrackNumber, 0x58D7, 2, KaxClusterSilentTracks, "ClusterSilentTrackNumber");
+DEFINE_MKX_UINTEGER(KaxClusterPosition, 0xA7, 1, KaxCluster, "ClusterPosition");
+DEFINE_MKX_UINTEGER(KaxClusterPrevSize, 0xAB, 1, KaxCluster, "ClusterPrevSize");
+#if MATROSKA_VERSION >= 2
+DEFINE_MKX_BINARY_CONS(KaxSimpleBlock, 0xA3, 1, KaxCluster, "SimpleBlock");
+#endif
+
+DEFINE_START_SEMANTIC(KaxBlockGroup)
+DEFINE_SEMANTIC_ITEM(true, true, KaxBlock)
+#if MATROSKA_VERSION >= 2
+DEFINE_SEMANTIC_ITEM(false, true, KaxBlockVirtual) // not supported
+#endif // MATROSKA_VERSION
+DEFINE_SEMANTIC_ITEM(false, true, KaxBlockAdditions)
+DEFINE_SEMANTIC_ITEM(false, true, KaxBlockDuration)
+DEFINE_SEMANTIC_ITEM(true, true, KaxReferencePriority)
+DEFINE_SEMANTIC_ITEM(false, false, KaxReferenceBlock)
+#if MATROSKA_VERSION >= 2
+DEFINE_SEMANTIC_ITEM(false, true, KaxReferenceVirtual) // not supported
+DEFINE_SEMANTIC_ITEM(false, true, KaxCodecState)
+DEFINE_SEMANTIC_ITEM(false, true, KaxDiscardPadding)
+#endif // MATROSKA_VERSION
+DEFINE_SEMANTIC_ITEM(false, true, KaxSlices)
+#if MATROSKA_VERSION >= 2
+DEFINE_SEMANTIC_ITEM(false, true, KaxReferenceFrame) // DivX specific
+#endif // MATROSKA_VERSION
+DEFINE_END_SEMANTIC(KaxBlockGroup)
+
+DEFINE_MKX_MASTER_CONS(KaxBlockGroup, 0xA0, 1, KaxCluster, "BlockGroup");
+DEFINE_MKX_BINARY_CONS(KaxBlock, 0xA1, 1, KaxBlockGroup, "Block");
+#if MATROSKA_VERSION >= 2
+DEFINE_MKX_BINARY_CONS(KaxBlockVirtual, 0xA2, 1, KaxBlockGroup, "BlockVirtual");
+#endif
+
+DEFINE_START_SEMANTIC(KaxBlockAdditions)
+DEFINE_SEMANTIC_ITEM(true, false, KaxBlockMore)
+DEFINE_END_SEMANTIC(KaxBlockAdditions)
+
+DEFINE_MKX_MASTER(KaxBlockAdditions, 0x75A1, 2, KaxBlockGroup, "BlockAdditions");
+
+DEFINE_START_SEMANTIC(KaxBlockMore)
+DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAddID)
+DEFINE_SEMANTIC_ITEM(true, true, KaxBlockAdditional)
+DEFINE_END_SEMANTIC(KaxBlockMore)
+
+DEFINE_MKX_MASTER(KaxBlockMore, 0xA6, 1, KaxBlockAdditions, "BlockMore");
+DEFINE_MKX_UINTEGER_DEF(KaxBlockAddID, 0xEE, 1, KaxBlockMore, "BlockAddID", 1);
+DEFINE_MKX_BINARY (KaxBlockAdditional, 0xA5, 1, KaxBlockMore, "BlockAdditional");
+DEFINE_MKX_UINTEGER(KaxBlockDuration, 0x9B, 1, KaxBlockGroup, "BlockDuration");
+DEFINE_MKX_UINTEGER_DEF(KaxReferencePriority, 0xFA, 1, KaxBlockGroup, "FlagReferenced", 0);
+DEFINE_MKX_SINTEGER_CONS(KaxReferenceBlock, 0xFB, 1, KaxBlockGroup, "ReferenceBlock");
+#if MATROSKA_VERSION >= 2
+DEFINE_MKX_SINTEGER(KaxReferenceVirtual, 0xFD, 1, KaxBlockGroup, "ReferenceVirtual");
+DEFINE_MKX_BINARY (KaxCodecState, 0xA4, 1, KaxBlockGroup, "CodecState");
+DEFINE_MKX_SINTEGER(KaxDiscardPadding, 0x75A2, 2, KaxBlockGroup, "DiscardPadding");
+#endif
+
+DEFINE_START_SEMANTIC(KaxSlices)
+DEFINE_SEMANTIC_ITEM(false, false, KaxTimeSlice)
+DEFINE_END_SEMANTIC(KaxSlices)
+
+DEFINE_MKX_MASTER(KaxSlices, 0x8E, 1, KaxBlockGroup, "Slices");
+
+DEFINE_START_SEMANTIC(KaxTimeSlice)

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxTracks.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxTracks.cpp Changed

@@ -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.
 **
@@ -35,87 +35,11 @@
 #include "matroska/KaxTracks.h"
 
 // sub elements
-#include "matroska/KaxTrackEntryData.h"
-#include "matroska/KaxTrackAudio.h"
-#include "matroska/KaxTrackVideo.h"
-#include "matroska/KaxContentEncoding.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxDefines.h"
 
 START_LIBMATROSKA_NAMESPACE
 
-DEFINE_START_SEMANTIC(KaxTracks)
-DEFINE_SEMANTIC_ITEM(true, false, KaxTrackEntry)
-DEFINE_END_SEMANTIC(KaxTracks)
-
-DEFINE_START_SEMANTIC(KaxTrackEntry)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackNumber)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackUID)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackType)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackFlagEnabled)
-#endif // MATROSKA_VERSION
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackFlagDefault)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackFlagForced)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackFlagLacing)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackMinCache)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTrackMaxCache)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTrackDefaultDuration)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackTimecodeScale)
-DEFINE_SEMANTIC_ITEM(true, true, KaxMaxBlockAdditionID)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTrackName)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTrackLanguage)
-DEFINE_SEMANTIC_ITEM(true, true, KaxCodecID)
-DEFINE_SEMANTIC_ITEM(false, true, KaxCodecPrivate)
-DEFINE_SEMANTIC_ITEM(false, true, KaxCodecName)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTrackAttachmentLink)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxCodecSettings)
-DEFINE_SEMANTIC_ITEM(false, false, KaxCodecInfoURL)
-DEFINE_SEMANTIC_ITEM(false, false, KaxCodecDownloadURL)
-DEFINE_SEMANTIC_ITEM(true, true, KaxCodecDecodeAll)
-#endif // MATROSKA_VERSION
-DEFINE_SEMANTIC_ITEM(false, false, KaxTrackOverlay)
-DEFINE_SEMANTIC_ITEM(false, false, KaxTrackTranslate)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTrackAudio)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTrackVideo)
-DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncodings)
-#if MATROSKA_VERSION >= 2
-DEFINE_SEMANTIC_ITEM(false, true, KaxTrackOperation)
-#endif
-DEFINE_END_SEMANTIC(KaxTrackEntry)
-
-DEFINE_MKX_MASTER     (KaxTracks, 0x1654AE6B, 4, KaxSegment, "Tracks");
-DEFINE_MKX_MASTER_CONS(KaxTrackEntry,   0xAE, 1, KaxTracks, "TrackEntry");
-
-#if MATROSKA_VERSION >= 2
-DEFINE_START_SEMANTIC(KaxTrackOperation)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTrackCombinePlanes)
-DEFINE_SEMANTIC_ITEM(false, true, KaxTrackJoinBlocks)
-DEFINE_END_SEMANTIC(KaxTrackOperation)
-
-DEFINE_START_SEMANTIC(KaxTrackCombinePlanes)
-DEFINE_SEMANTIC_ITEM(true, false, KaxTrackPlane)
-DEFINE_END_SEMANTIC(KaxTrackCombinePlanes)
-
-DEFINE_START_SEMANTIC(KaxTrackPlane)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackPlaneUID)
-DEFINE_SEMANTIC_ITEM(true, true, KaxTrackPlaneType)
-DEFINE_END_SEMANTIC(KaxTrackPlane)
-
-DEFINE_START_SEMANTIC(KaxTrackJoinBlocks)
-DEFINE_SEMANTIC_ITEM(true, false, KaxTrackJoinUID)
-DEFINE_END_SEMANTIC(KaxTrackJoinBlocks)
-
-DEFINE_MKX_MASTER  (KaxTrackOperation,     0xE2, 1, KaxTracks, "TrackOperation");
-DEFINE_MKX_MASTER  (KaxTrackCombinePlanes, 0xE3, 1, KaxTrackOperation, "TrackCombinePlanes");
-DEFINE_MKX_MASTER  (KaxTrackPlane,         0xE4, 1, KaxTrackCombinePlanes, "TrackPlane");
-DEFINE_MKX_UINTEGER(KaxTrackPlaneUID,      0xE5, 1, KaxTrackPlane, "TrackPlaneUID");
-DEFINE_MKX_UINTEGER(KaxTrackPlaneType,     0xE6, 1, KaxTrackPlane, "TrackPlaneType");
-DEFINE_MKX_MASTER  (KaxTrackJoinBlocks,    0xE9, 1, KaxTrackOperation, "TrackJoinBlocks");
-DEFINE_MKX_UINTEGER(KaxTrackJoinUID,       0xED, 1, KaxTrackJoinBlocks, "TrackJoinUID");
-#endif
-
 KaxTrackEntry::KaxTrackEntry(EBML_EXTRA_DEF)
 	:EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxTrackEntry) EBML_DEF_SEP EBML_EXTRA_CALL)
 	,bGlobalTimecodeScaleIsSet(false)

makemkv-oss-1.8.6.tar.gz/libmatroska/src/KaxVersion.cpp -> makemkv-oss-1.8.7.tar.gz/libmatroska/src/KaxVersion.cpp Changed

@@ -11,17 +11,17 @@
 ** 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
+** 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.
 **
@@ -37,4 +37,7 @@
 
 START_LIBMATROSKA_NAMESPACE
 
+const ccc::string KaxCodeVersion = "1.4.1";
+const ccc::string KaxCodeDate    = __TIMESTAMP__;
+
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.8.6.tar.gz/makefile.common -> makemkv-oss-1.8.7.tar.gz/makefile.common Changed

@@ -9,7 +9,7 @@
 
 LIBEBML_INC=-Ilibebml/inc
 
-LIBEBML_DEF=-DEBML_NO_READ -DEBML_STRICT_API
+LIBEBML_DEF=-DEBML_NO_READ -DEBML_STRICT_API -DEBML_DEBUG
 
 LIBEBML_SRC=libebml/src/EbmlBinary.cpp libebml/src/EbmlContexts.cpp libebml/src/EbmlCrc32.cpp \
   libebml/src/EbmlDate.cpp libebml/src/EbmlDummy.cpp libebml/src/EbmlElement.cpp libebml/src/EbmlFloat.cpp \
@@ -20,13 +20,10 @@
 LIBMATROSKA_INC=-Ilibmatroska/inc
 
 LIBMATROSKA_SRC=libmatroska/src/FileKax.cpp libmatroska/src/KaxAttached.cpp libmatroska/src/KaxAttachments.cpp \
-  libmatroska/src/KaxBlock.cpp libmatroska/src/KaxBlockData.cpp libmatroska/src/KaxChapters.cpp \
-  libmatroska/src/KaxCluster.cpp libmatroska/src/KaxClusterData.cpp libmatroska/src/KaxContentEncoding.cpp \
-  libmatroska/src/KaxContexts.cpp libmatroska/src/KaxCues.cpp libmatroska/src/KaxCuesData.cpp \
-  libmatroska/src/KaxInfo.cpp libmatroska/src/KaxInfoData.cpp libmatroska/src/KaxSeekHead.cpp libmatroska/src/KaxSegment.cpp \
-  libmatroska/src/KaxTag.cpp libmatroska/src/KaxTags.cpp libmatroska/src/KaxTrackAudio.cpp \
-  libmatroska/src/KaxTrackEntryData.cpp libmatroska/src/KaxTracks.cpp libmatroska/src/KaxTrackVideo.cpp \
-  libmatroska/src/KaxVersion.cpp
+  libmatroska/src/KaxBlock.cpp libmatroska/src/KaxBlockData.cpp libmatroska/src/KaxCluster.cpp libmatroska/src/KaxContexts.cpp \
+  libmatroska/src/KaxCues.cpp libmatroska/src/KaxCuesData.cpp \
+  libmatroska/src/KaxInfoData.cpp libmatroska/src/KaxSeekHead.cpp libmatroska/src/KaxSegment.cpp \
+  libmatroska/src/KaxTracks.cpp libmatroska/src/KaxVersion.cpp libmatroska/src/KaxSemantic.cpp
 
 SSTRING_INC=-Isstring/inc
 
@@ -46,7 +43,8 @@
 
 LIBMAKEMKV_INC=-Ilibmakemkv/inc
 
-LIBMAKEMKV_SRC=libmakemkv/src/ebmlwrite.cpp libmakemkv/src/libmkv.cpp libmakemkv/src/version.cpp libmakemkv/src/world.cpp
+LIBMAKEMKV_SRC=libmakemkv/src/ebmlwrite.cpp libmakemkv/src/libmkv.cpp libmakemkv/src/version.cpp libmakemkv/src/world.cpp \
+    libmakemkv/src/stdstring.cpp
 
 MAKEMKVGUI_INC=-Imakemkvgui/inc

makemkv-oss-1.8.6.tar.gz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.8.7.tar.gz/makemkvgui/inc/ver_num.h Changed

Changes of Revision 28