libmatroska: headers diff between 1.1.0 and 1.2.0 versions

	KaxAttached.h	KaxAttached.h

	skipping to change at line 38	skipping to change at line 38
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file
	\version \$Id: KaxAttached.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $	\version \$Id: KaxAttached.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_ATTACHED_H	#ifndef LIBMATROSKA_ATTACHED_H
	#define LIBMATROSKA_ATTACHED_H	#define LIBMATROSKA_ATTACHED_H


	#include "matroska/KaxTypes.h"	#include "matroska/KaxSemantic.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

	#endif // LIBMATROSKA_ATTACHED_H	#endif // LIBMATROSKA_ATTACHED_H

End of changes. 1 change blocks.
	34 lines changed or deleted	1 lines changed or added

	KaxAttachments.h	KaxAttachments.h

	skipping to change at line 38	skipping to change at line 38
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file
	\version \$Id: KaxAttachments.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $	\version \$Id: KaxAttachments.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_ATTACHEMENTS_H	#ifndef LIBMATROSKA_ATTACHEMENTS_H
	#define LIBMATROSKA_ATTACHEMENTS_H	#define LIBMATROSKA_ATTACHEMENTS_H


	#include "matroska/KaxTypes.h"	#include "matroska/KaxSemantic.h"
	#include "ebml/EbmlMaster.h"
	#include "matroska/KaxDefines.h"

	using namespace LIBEBML_NAMESPACE;

	START_LIBMATROSKA_NAMESPACE

	DECLARE_MKX_MASTER(KaxAttachments)
	};

	END_LIBMATROSKA_NAMESPACE

	#endif // LIBMATROSKA_ATTACHEMENTS_H	#endif // LIBMATROSKA_ATTACHEMENTS_H

End of changes. 1 change blocks.
	12 lines changed or deleted	1 lines changed or added

	KaxBlock.h	KaxBlock.h

	skipping to change at line 362	skipping to change at line 362
	union {	union {
	KaxBlockGroup *group;	KaxBlockGroup *group;
	#if MATROSKA_VERSION >= 2	#if MATROSKA_VERSION >= 2
	KaxSimpleBlock *simpleblock;	KaxSimpleBlock *simpleblock;
	#endif // MATROSKA_VERSION	#endif // MATROSKA_VERSION
	} Block;	} Block;
	bool bUseSimpleBlock;	bool bUseSimpleBlock;
	BlockBlobType SimpleBlockMode;	BlockBlobType SimpleBlockMode;
	};	};


	DECLARE_MKX_UINTEGER(KaxBlockDuration)
	};

	#if MATROSKA_VERSION >= 2	#if MATROSKA_VERSION >= 2
	DECLARE_MKX_BINARY_CONS(KaxBlockVirtual)	DECLARE_MKX_BINARY_CONS(KaxBlockVirtual)
	public:	public:
	~KaxBlockVirtual();	~KaxBlockVirtual();

	/*!	/*!
	\note override this function to generate the Data/Si ze on the fly, unlike the usual binary elements	\note override this function to generate the Data/Si ze on the fly, unlike the usual binary elements
	*/	*/
	filepos_t UpdateSize(bool bSaveDefault = false, bool bForceR ender = false);	filepos_t UpdateSize(bool bSaveDefault = false, bool bForceR ender = false);

	void SetParent(const KaxCluster & aParentCluster) {ParentClu ster = &aParentCluster;}	void SetParent(const KaxCluster & aParentCluster) {ParentClu ster = &aParentCluster;}


		filepos_t RenderData(IOCallback & output, bool bForceRender, bool b
		SaveDefault);

		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_
		ALL_DATA);

	protected:	protected:
	uint64 Timecode; // temporary timecode of the first frame if there are more than one	uint64 Timecode; // temporary timecode of the first frame if there are more than one
	uint16 TrackNumber;	uint16 TrackNumber;
	binary DataBlock[5];	binary DataBlock[5];

	const KaxCluster * ParentCluster;	const KaxCluster * ParentCluster;
	};	};
	#endif // MATROSKA_VERSION	#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	END_LIBMATROSKA_NAMESPACE

	#endif // LIBMATROSKA_BLOCK_H	#endif // LIBMATROSKA_BLOCK_H

End of changes. 3 change blocks.
	18 lines changed or deleted	6 lines changed or added

	KaxBlockData.h	KaxBlockData.h

	skipping to change at line 41	skipping to change at line 41
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_BLOCK_ADDITIONAL_H	#ifndef LIBMATROSKA_BLOCK_ADDITIONAL_H
	#define LIBMATROSKA_BLOCK_ADDITIONAL_H	#define LIBMATROSKA_BLOCK_ADDITIONAL_H

	#include "matroska/KaxTypes.h"	#include "matroska/KaxTypes.h"
	#include "ebml/EbmlMaster.h"	#include "ebml/EbmlMaster.h"
	#include "ebml/EbmlUInteger.h"	#include "ebml/EbmlUInteger.h"
	#include "ebml/EbmlSInteger.h"	#include "ebml/EbmlSInteger.h"
	#include "matroska/KaxDefines.h"	#include "matroska/KaxDefines.h"

		#include "matroska/KaxBlock.h"

	using namespace LIBEBML_NAMESPACE;	using namespace LIBEBML_NAMESPACE;

	START_LIBMATROSKA_NAMESPACE	START_LIBMATROSKA_NAMESPACE


	class KaxReferenceBlock;
	class KaxBlockGroup;
	class KaxBlockBlob;

	DECLARE_MKX_UINTEGER(KaxReferencePriority)
	};

	/*!	/*!
	\brief element used for B frame-likes	\brief element used for B frame-likes
	*/	*/
	DECLARE_MKX_SINTEGER_CONS(KaxReferenceBlock)	DECLARE_MKX_SINTEGER_CONS(KaxReferenceBlock)
	public:	public:
	~KaxReferenceBlock();	~KaxReferenceBlock();
	/*!	/*!
	\brief override this method to compute the timecode value	\brief override this method to compute the timecode value
	*/	*/
	virtual filepos_t UpdateSize(bool bSaveDefault = false, bool bForceRender = false);	virtual filepos_t UpdateSize(bool bSaveDefault = false, bool bForceRender = false);

	skipping to change at line 78	skipping to change at line 72

	protected:	protected:
	const KaxBlockBlob * RefdBlock;	const KaxBlockBlob * RefdBlock;
	const KaxBlockGroup * ParentBlock;	const KaxBlockGroup * ParentBlock;
	void SetReferencedTimecode(int64 refTimecode) {static_cast< EbmlSInteger>(this) = refTimecode; bTimecodeSet = true;};	void SetReferencedTimecode(int64 refTimecode) {static_cast< EbmlSInteger>(this) = refTimecode; bTimecodeSet = true;};
	bool bTimecodeSet;	bool bTimecodeSet;
	bool bOurBlob;	bool bOurBlob;
	void FreeBlob();	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	END_LIBMATROSKA_NAMESPACE

	#endif // LIBMATROSKA_BLOCK_ADDITIONAL_H	#endif // LIBMATROSKA_BLOCK_ADDITIONAL_H

End of changes. 3 change blocks.
	33 lines changed or deleted	1 lines changed or added

	KaxChapters.h	KaxChapters.h

	skipping to change at line 32	skipping to change at line 32
	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	**	**
	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .
	** Contact license@matroska.org if any conditions of this licensing are	** Contact license@matroska.org if any conditions of this licensing are
	** not clear to you.	** not clear to you.
	**	**
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file

	\version \$Id: KaxChapters.h 270 2010-05-25 12:02:30Z robux4 $	\version \$Id: KaxChapters.h 725 2011-03-27 17:09:02Z robux4 $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_CHAPTERS_H	#ifndef LIBMATROSKA_CHAPTERS_H
	#define LIBMATROSKA_CHAPTERS_H	#define LIBMATROSKA_CHAPTERS_H


	#include "matroska/KaxTypes.h"	#include "matroska/KaxSemantic.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() && (Ge
	tSize() == 16);}
	};

	DECLARE_MKX_BINARY(KaxChapterSegmentEditionUID)
	public:
	virtual bool ValidateSize() const { return IsFiniteSize() && (Ge
	tSize() == 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

	#endif // LIBMATROSKA_CHAPTERS_H	#endif // LIBMATROSKA_CHAPTERS_H

End of changes. 2 change blocks.
	101 lines changed or deleted	2 lines changed or added

	KaxCluster.h	KaxCluster.h

	skipping to change at line 43	skipping to change at line 43

	*/	*/
	#ifndef LIBMATROSKA_CLUSTER_H	#ifndef LIBMATROSKA_CLUSTER_H
	#define LIBMATROSKA_CLUSTER_H	#define LIBMATROSKA_CLUSTER_H

	#include "matroska/KaxTypes.h"	#include "matroska/KaxTypes.h"
	#include "ebml/EbmlMaster.h"	#include "ebml/EbmlMaster.h"
	#include "matroska/KaxTracks.h"	#include "matroska/KaxTracks.h"
	#include "matroska/KaxBlock.h"	#include "matroska/KaxBlock.h"
	#include "matroska/KaxCues.h"	#include "matroska/KaxCues.h"

	#include "matroska/KaxClusterData.h"
	#include "matroska/KaxDefines.h"	#include "matroska/KaxDefines.h"

	using namespace LIBEBML_NAMESPACE;	using namespace LIBEBML_NAMESPACE;

	START_LIBMATROSKA_NAMESPACE	START_LIBMATROSKA_NAMESPACE

	class KaxSegment;	class KaxSegment;

	DECLARE_MKX_MASTER_CONS(KaxCluster)	DECLARE_MKX_MASTER_CONS(KaxCluster)
	public:	public:

End of changes. 1 change blocks.
	1 lines changed or deleted	0 lines changed or added

	KaxClusterData.h	KaxClusterData.h

	skipping to change at line 38	skipping to change at line 38
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file
	\version \$Id: KaxClusterData.h,v 1.9 2004/04/21 19:50:10 mosu Exp $	\version \$Id: KaxClusterData.h,v 1.9 2004/04/21 19:50:10 mosu Exp $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_CLUSTER_DATA_H	#ifndef LIBMATROSKA_CLUSTER_DATA_H
	#define LIBMATROSKA_CLUSTER_DATA_H	#define LIBMATROSKA_CLUSTER_DATA_H


	#include "matroska/KaxTypes.h"	#include "matroska/KaxSemantic.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

	#endif // LIBMATROSKA_CLUSTER_DATA_H	#endif // LIBMATROSKA_CLUSTER_DATA_H

End of changes. 1 change blocks.
	25 lines changed or deleted	1 lines changed or added

	KaxContentEncoding.h	KaxContentEncoding.h

	skipping to change at line 33	skipping to change at line 33
	**	**
	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .
	** Contact license@matroska.org if any conditions of this licensing are	** Contact license@matroska.org if any conditions of this licensing are
	** not clear to you.	** not clear to you.
	**	**
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file
	\version \$Id: KaxContentEncoding.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $	\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	#ifndef LIBMATROSKA_CONTENT_ENCODING_H
	#define LIBMATROSKA_CONTENT_ENCODING_H	#define LIBMATROSKA_CONTENT_ENCODING_H


	#include "matroska/KaxTypes.h"	#include "matroska/KaxSemantic.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

	#endif // LIBMATROSKA_CONTENT_ENCODING_H	#endif // LIBMATROSKA_CONTENT_ENCODING_H

End of changes. 2 change blocks.
	57 lines changed or deleted	2 lines changed or added

	KaxCuesData.h	KaxCuesData.h

	skipping to change at line 61	skipping to change at line 61
	public:	public:
	void PositionSet(const KaxBlockGroup & BlockReference, uint6 4 GlobalTimecodeScale);	void PositionSet(const KaxBlockGroup & BlockReference, uint6 4 GlobalTimecodeScale);
	void PositionSet(const KaxBlockBlob & BlobReference, uint64 GlobalTimecodeScale);	void PositionSet(const KaxBlockBlob & BlobReference, uint64 GlobalTimecodeScale);

	virtual bool IsSmallerThan(const EbmlElement *Cmp) const;	virtual bool IsSmallerThan(const EbmlElement *Cmp) const;

	const KaxCueTrackPositions * GetSeekPosition() const;	const KaxCueTrackPositions * GetSeekPosition() const;
	bool Timecode(uint64 & aTimecode, uint64 GlobalTimecodeScale ) const;	bool Timecode(uint64 & aTimecode, uint64 GlobalTimecodeScale ) const;
	};	};


	DECLARE_MKX_UINTEGER(KaxCueTime)
	};

	DECLARE_MKX_MASTER(KaxCueTrackPositions)	DECLARE_MKX_MASTER(KaxCueTrackPositions)
	public:	public:
	uint64 ClusterPosition() const;	uint64 ClusterPosition() const;
	uint16 TrackNumber() const;	uint16 TrackNumber() const;
	};	};


	DECLARE_MKX_UINTEGER(KaxCueTrack)
	};

	DECLARE_MKX_UINTEGER(KaxCueClusterPosition)
	};

	DECLARE_MKX_UINTEGER(KaxCueBlockNumber)
	};

	#if MATROSKA_VERSION >= 2	#if MATROSKA_VERSION >= 2

	DECLARE_MKX_UINTEGER(KaxCueCodecState)
	};

	DECLARE_MKX_MASTER(KaxCueReference)	DECLARE_MKX_MASTER(KaxCueReference)
	public:	public:
	void AddReference(const KaxBlockGroup & BlockReferenced, uin t64 GlobalTimecodeScale);	void AddReference(const KaxBlockGroup & BlockReferenced, uin t64 GlobalTimecodeScale);
	void AddReference(const KaxBlockBlob & BlockReferenced, uint 64 GlobalTimecodeScale);	void AddReference(const KaxBlockBlob & BlockReferenced, uint 64 GlobalTimecodeScale);
	};	};


	DECLARE_MKX_UINTEGER(KaxCueRefTime)
	};

	DECLARE_MKX_UINTEGER(KaxCueRefCluster)
	};

	DECLARE_MKX_UINTEGER(KaxCueRefNumber)
	};

	DECLARE_MKX_UINTEGER(KaxCueRefCodecState)
	};
	#endif // MATROSKA_VERSION	#endif // MATROSKA_VERSION

	END_LIBMATROSKA_NAMESPACE	END_LIBMATROSKA_NAMESPACE

	#endif // LIBMATROSKA_CUES_DATA_H	#endif // LIBMATROSKA_CUES_DATA_H

End of changes. 4 change blocks.
	27 lines changed or deleted	0 lines changed or added

	KaxInfo.h	KaxInfo.h

	skipping to change at line 38	skipping to change at line 38
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file
	\version \$Id: KaxInfo.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $	\version \$Id: KaxInfo.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_INFO_H	#ifndef LIBMATROSKA_INFO_H
	#define LIBMATROSKA_INFO_H	#define LIBMATROSKA_INFO_H


	#include "matroska/KaxTypes.h"	#include "matroska/KaxSemantic.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

	#endif // LIBMATROSKA_INFO_H	#endif // LIBMATROSKA_INFO_H

End of changes. 1 change blocks.
	19 lines changed or deleted	1 lines changed or added

	KaxInfoData.h	KaxInfoData.h

	skipping to change at line 32	skipping to change at line 32
	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	**	**
	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .
	** Contact license@matroska.org if any conditions of this licensing are	** Contact license@matroska.org if any conditions of this licensing are
	** not clear to you.	** not clear to you.
	**	**
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file

	\version \$Id: KaxInfoData.h 353 2010-06-27 05:24:02Z robux4 $	\version \$Id: KaxInfoData.h 725 2011-03-27 17:09:02Z robux4 $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	\author John Cannon <spyder2555 @ users.sf.net>	\author John Cannon <spyder2555 @ users.sf.net>
	\author Moritz Bunkus <moritz @ bunkus.org>	\author Moritz Bunkus <moritz @ bunkus.org>
	*/	*/
	#ifndef LIBMATROSKA_INFO_DATA_H	#ifndef LIBMATROSKA_INFO_DATA_H
	#define LIBMATROSKA_INFO_DATA_H	#define LIBMATROSKA_INFO_DATA_H

	#include "matroska/KaxTypes.h"	#include "matroska/KaxTypes.h"
	#include "ebml/EbmlUInteger.h"	#include "ebml/EbmlUInteger.h"
	#include "ebml/EbmlFloat.h"	#include "ebml/EbmlFloat.h"
	#include "ebml/EbmlUnicodeString.h"	#include "ebml/EbmlUnicodeString.h"
	#include "ebml/EbmlBinary.h"	#include "ebml/EbmlBinary.h"
	#include "ebml/EbmlDate.h"	#include "ebml/EbmlDate.h"
	#include "ebml/EbmlMaster.h"	#include "ebml/EbmlMaster.h"
	#include "matroska/KaxDefines.h"	#include "matroska/KaxDefines.h"

		#include "matroska/KaxSemantic.h"

	using namespace LIBEBML_NAMESPACE;	using namespace LIBEBML_NAMESPACE;

	START_LIBMATROSKA_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);	DECLARE_MKX_CONTEXT(KaxPrevUID);
	class MATROSKA_DLL_API KaxPrevUID : public KaxSegmentUID {	class MATROSKA_DLL_API KaxPrevUID : public KaxSegmentUID {
	public:	public:
	KaxPrevUID(EBML_EXTRA_PARAM);	KaxPrevUID(EBML_EXTRA_PARAM);
	KaxPrevUID(const KaxPrevUID & ElementToClone) :KaxSegmentUID (ElementToClone){}	KaxPrevUID(const KaxPrevUID & ElementToClone) :KaxSegmentUID (ElementToClone){}
	virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}	virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}

	EBML_CONCRETE_CLASS(KaxPrevUID)	EBML_CONCRETE_CLASS(KaxPrevUID)
	};	};


	DECLARE_MKX_UNISTRING(KaxPrevFilename)
	};

	DECLARE_MKX_CONTEXT(KaxNextUID);	DECLARE_MKX_CONTEXT(KaxNextUID);
	class MATROSKA_DLL_API KaxNextUID : public KaxSegmentUID {	class MATROSKA_DLL_API KaxNextUID : public KaxSegmentUID {
	public:	public:
	KaxNextUID(EBML_EXTRA_PARAM);	KaxNextUID(EBML_EXTRA_PARAM);
	KaxNextUID(const KaxNextUID & ElementToClone) :KaxSegmentUID (ElementToClone){}	KaxNextUID(const KaxNextUID & ElementToClone) :KaxSegmentUID (ElementToClone){}
	virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}	virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}

	EBML_CONCRETE_CLASS(KaxNextUID)	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	END_LIBMATROSKA_NAMESPACE

	#endif // LIBMATROSKA_INFO_DATA_H	#endif // LIBMATROSKA_INFO_DATA_H

End of changes. 5 change blocks.
	49 lines changed or deleted	2 lines changed or added

	KaxSeekHead.h	KaxSeekHead.h

	skipping to change at line 32	skipping to change at line 32
	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	**	**
	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .
	** Contact license@matroska.org if any conditions of this licensing are	** Contact license@matroska.org if any conditions of this licensing are
	** not clear to you.	** not clear to you.
	**	**
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file

	\version \$Id: KaxSeekHead.h 270 2010-05-25 12:02:30Z robux4 $	\version \$Id: KaxSeekHead.h 725 2011-03-27 17:09:02Z robux4 $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_SEEK_HEAD_H	#ifndef LIBMATROSKA_SEEK_HEAD_H
	#define LIBMATROSKA_SEEK_HEAD_H	#define LIBMATROSKA_SEEK_HEAD_H

	#include "matroska/KaxTypes.h"	#include "matroska/KaxTypes.h"
	#include "ebml/EbmlMaster.h"	#include "ebml/EbmlMaster.h"
	#include "ebml/EbmlBinary.h"	#include "ebml/EbmlBinary.h"
	#include "ebml/EbmlUInteger.h"	#include "ebml/EbmlUInteger.h"
	#include "matroska/KaxDefines.h"	#include "matroska/KaxDefines.h"

	using namespace LIBEBML_NAMESPACE;	using namespace LIBEBML_NAMESPACE;

	START_LIBMATROSKA_NAMESPACE	START_LIBMATROSKA_NAMESPACE

	class KaxSegment;	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)	DECLARE_MKX_MASTER(KaxSeekHead)
	public:	public:
	/*!	/*!
	\brief add an element to index in the Meta Seek data	\brief add an element to index in the Meta Seek data
	\note the element should already be written in the f ile	\note the element should already be written in the f ile
	*/	*/
	void IndexThis(const EbmlElement & aElt, const KaxSegment & ParentSegment);	void IndexThis(const EbmlElement & aElt, const KaxSegment & ParentSegment);

	KaxSeek * FindFirstOf(const EbmlCallbacks & Callbacks) const ;	KaxSeek * FindFirstOf(const EbmlCallbacks & Callbacks) const ;
	KaxSeek * FindNextOf(const KaxSeek &aPrev) const;	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	END_LIBMATROSKA_NAMESPACE

	#endif // LIBMATROSKA_SEEK_HEAD_H	#endif // LIBMATROSKA_SEEK_HEAD_H

End of changes. 3 change blocks.
	18 lines changed or deleted	8 lines changed or added

	KaxTag.h	KaxTag.h

	skipping to change at line 32	skipping to change at line 32
	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	**	**
	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .
	** Contact license@matroska.org if any conditions of this licensing are	** Contact license@matroska.org if any conditions of this licensing are
	** not clear to you.	** not clear to you.
	**	**
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file

	\version \$Id: KaxTag.h 385 2010-07-04 09:32:26Z robux4 $	\version \$Id: KaxTag.h 725 2011-03-27 17:09:02Z robux4 $
	\author Jory Stone <jcsston @ toughguy.net>
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_TAG_H	#ifndef LIBMATROSKA_TAG_H
	#define LIBMATROSKA_TAG_H	#define LIBMATROSKA_TAG_H


	#include "matroska/KaxTypes.h"	#include "matroska/KaxSemantic.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

	#endif // LIBMATROSKA_TAG_H	#endif // LIBMATROSKA_TAG_H

End of changes. 2 change blocks.
	62 lines changed or deleted	2 lines changed or added

	KaxTags.h	KaxTags.h

	skipping to change at line 38	skipping to change at line 38
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file
	\version \$Id: KaxTags.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $	\version \$Id: KaxTags.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_TAGS_H	#ifndef LIBMATROSKA_TAGS_H
	#define LIBMATROSKA_TAGS_H	#define LIBMATROSKA_TAGS_H


	#include "matroska/KaxTypes.h"	#include "matroska/KaxSemantic.h"
	#include "ebml/EbmlMaster.h"
	#include "matroska/KaxDefines.h"

	using namespace LIBEBML_NAMESPACE;

	START_LIBMATROSKA_NAMESPACE

	DECLARE_MKX_MASTER(KaxTags)
	};

	END_LIBMATROSKA_NAMESPACE

	#endif // LIBMATROSKA_TAGS_H	#endif // LIBMATROSKA_TAGS_H

End of changes. 1 change blocks.
	12 lines changed or deleted	1 lines changed or added

	KaxTrackAudio.h	KaxTrackAudio.h

	skipping to change at line 38	skipping to change at line 38
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file
	\version \$Id: KaxTrackAudio.h,v 1.11 2004/04/14 23:26:17 robux4 Exp $	\version \$Id: KaxTrackAudio.h,v 1.11 2004/04/14 23:26:17 robux4 Exp $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_TRACK_AUDIO_H	#ifndef LIBMATROSKA_TRACK_AUDIO_H
	#define LIBMATROSKA_TRACK_AUDIO_H	#define LIBMATROSKA_TRACK_AUDIO_H


	#include "matroska/KaxTypes.h"	#include "matroska/KaxSemantic.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

	#endif // LIBMATROSKA_TRACK_AUDIO_H	#endif // LIBMATROSKA_TRACK_AUDIO_H

End of changes. 1 change blocks.
	32 lines changed or deleted	1 lines changed or added

	KaxTrackEntryData.h	KaxTrackEntryData.h

	skipping to change at line 34	skipping to change at line 34
	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .
	** Contact license@matroska.org if any conditions of this licensing are	** Contact license@matroska.org if any conditions of this licensing are
	** not clear to you.	** not clear to you.
	**	**
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file
	\version \$Id: KaxTrackEntryData.h,v 1.9 2004/04/14 23:26:17 robux4 Exp $	\version \$Id: KaxTrackEntryData.h,v 1.9 2004/04/14 23:26:17 robux4 Exp $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>

	\author John Cannon <spyder2555 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_TRACK_ENTRY_DATA_H	#ifndef LIBMATROSKA_TRACK_ENTRY_DATA_H
	#define LIBMATROSKA_TRACK_ENTRY_DATA_H	#define LIBMATROSKA_TRACK_ENTRY_DATA_H


	#include "matroska/KaxTypes.h"	#include "matroska/KaxSemantic.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

	#endif // LIBMATROSKA_TRACK_ENTRY_DATA_H	#endif // LIBMATROSKA_TRACK_ENTRY_DATA_H

End of changes. 2 change blocks.
	100 lines changed or deleted	1 lines changed or added

	KaxTrackVideo.h	KaxTrackVideo.h

	skipping to change at line 32	skipping to change at line 32
	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	**	**
	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .
	** Contact license@matroska.org if any conditions of this licensing are	** Contact license@matroska.org if any conditions of this licensing are
	** not clear to you.	** not clear to you.
	**	**
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file

	\version \$Id: KaxTrackVideo.h 270 2010-05-25 12:02:30Z robux4 $	\version \$Id: KaxTrackVideo.h 725 2011-03-27 17:09:02Z robux4 $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_TRACK_VIDEO_H	#ifndef LIBMATROSKA_TRACK_VIDEO_H
	#define LIBMATROSKA_TRACK_VIDEO_H	#define LIBMATROSKA_TRACK_VIDEO_H


	#include "matroska/KaxTypes.h"	#include "matroska/KaxSemantic.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

	#endif // LIBMATROSKA_TRACK_VIDEO_H	#endif // LIBMATROSKA_TRACK_VIDEO_H

End of changes. 2 change blocks.
	73 lines changed or deleted	2 lines changed or added

	KaxTracks.h	KaxTracks.h

	skipping to change at line 41	skipping to change at line 41
	\file	\file
	\version \$Id: KaxTracks.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $	\version \$Id: KaxTracks.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_TRACKS_H	#ifndef LIBMATROSKA_TRACKS_H
	#define LIBMATROSKA_TRACKS_H	#define LIBMATROSKA_TRACKS_H

	#include "matroska/KaxTypes.h"	#include "matroska/KaxTypes.h"
	#include "ebml/EbmlMaster.h"	#include "ebml/EbmlMaster.h"
	#include "ebml/EbmlUInteger.h"	#include "ebml/EbmlUInteger.h"

	#include "matroska/KaxTrackEntryData.h"
	#include "matroska/KaxDefines.h"	#include "matroska/KaxDefines.h"

		#include "matroska/KaxSemantic.h"

	using namespace LIBEBML_NAMESPACE;	using namespace LIBEBML_NAMESPACE;

	START_LIBMATROSKA_NAMESPACE	START_LIBMATROSKA_NAMESPACE


	DECLARE_MKX_MASTER(KaxTracks)
	};

	DECLARE_MKX_MASTER(KaxTrackEntry)	DECLARE_MKX_MASTER(KaxTrackEntry)
	public:	public:
	EbmlUInteger & TrackNumber() const { return (static_cast<Eb mlUInteger >(FindElt(EBML_INFO(KaxTrackNumber)))); }	EbmlUInteger & TrackNumber() const { return (static_cast<Eb mlUInteger >(FindElt(EBML_INFO(KaxTrackNumber)))); }

	void EnableLacing(bool bEnable = true);	void EnableLacing(bool bEnable = true);

	/*!	/*!
	\note lacing set by default	\note lacing set by default
	*/	*/
	inline bool LacingEnabled() const {	inline bool LacingEnabled() const {

	skipping to change at line 79	skipping to change at line 76
	uint64 GlobalTimecodeScale() const {	uint64 GlobalTimecodeScale() const {
	assert(bGlobalTimecodeScaleIsSet);	assert(bGlobalTimecodeScaleIsSet);
	return mGlobalTimecodeScale;	return mGlobalTimecodeScale;
	}	}

	protected:	protected:
	bool bGlobalTimecodeScaleIsSet;	bool bGlobalTimecodeScaleIsSet;
	uint64 mGlobalTimecodeScale;	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	END_LIBMATROSKA_NAMESPACE

	#endif // LIBMATROSKA_TRACKS_H	#endif // LIBMATROSKA_TRACKS_H

End of changes. 4 change blocks.
	27 lines changed or deleted	1 lines changed or added

	KaxVersion.h	KaxVersion.h

	skipping to change at line 43	skipping to change at line 43
	#ifndef LIBMATROSKA_VERSION_H	#ifndef LIBMATROSKA_VERSION_H
	#define LIBMATROSKA_VERSION_H	#define LIBMATROSKA_VERSION_H

	#include <string>	#include <string>

	#include "ebml/EbmlConfig.h"	#include "ebml/EbmlConfig.h"
	#include "matroska/KaxConfig.h"	#include "matroska/KaxConfig.h"

	START_LIBMATROSKA_NAMESPACE	START_LIBMATROSKA_NAMESPACE


	#define LIBMATROSKA_VERSION 0x010100	#define LIBMATROSKA_VERSION 0x010200


	static const std::string KaxCodeVersion = "1.1.0";	static const std::string KaxCodeVersion = "1.2.0";
	static const std::string KaxCodeDate = __TIMESTAMP__;	static const std::string KaxCodeDate = __TIMESTAMP__;

	/*!	/*!
	\todo Improve the CRC/ECC system (backward and forward possible ?) t o fit streaming/live writing/simple reading	\todo Improve the CRC/ECC system (backward and forward possible ?) t o fit streaming/live writing/simple reading
	*/	*/

	END_LIBMATROSKA_NAMESPACE	END_LIBMATROSKA_NAMESPACE

	#endif // LIBMATROSKA_VERSION_H	#endif // LIBMATROSKA_VERSION_H

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	KaxDefines.h	KaxDefines.h

	skipping to change at line 30	skipping to change at line 30
	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	**	**
	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .	See http://www.matroska.org/license/lgpl/ for LGPL licensing information .
	** Contact license@matroska.org if any conditions of this licensing are	** Contact license@matroska.org if any conditions of this licensing are
	** not clear to you.	** not clear to you.
	**	**
	**********************************************************************/	**********************************************************************/

	/*!	/*!
	\file	\file

	\version \$Id: KaxDefines.h 353 2010-06-27 05:24:02Z robux4 $	\version \$Id: KaxDefines.h 725 2011-03-27 17:09:02Z robux4 $
	\author Steve Lhomme <robux4 @ users.sf.net>	\author Steve Lhomme <robux4 @ users.sf.net>
	*/	*/
	#ifndef LIBMATROSKA_DEFINES_H	#ifndef LIBMATROSKA_DEFINES_H
	#define LIBMATROSKA_DEFINES_H	#define LIBMATROSKA_DEFINES_H

	#include "ebml/EbmlVersion.h"	#include "ebml/EbmlVersion.h"
	#include "ebml/EbmlElement.h"	#include "ebml/EbmlElement.h"

	#if defined(HAVE_EBML2) \|\| defined(HAS_EBML2)	#if defined(HAVE_EBML2) \|\| defined(HAS_EBML2)
	#define DEFINE_MKX_CONTEXT(a) DEFINE_xxx_CONTEXT(a,EBML_Sema nticGlobal)	#define DEFINE_MKX_CONTEXT(a) DEFINE_xxx_CONTEXT(a,EBML_Sema nticGlobal)
	#define DEFINE_MKX_MASTER_CONS(a,b,c,d,e) DEFINE_xxx_MASTER_CONS(a,b,d,e ,EBML_SemanticGlobal)	#define DEFINE_MKX_MASTER_CONS(a,b,c,d,e) DEFINE_xxx_MASTER_CONS(a,b,d,e ,EBML_SemanticGlobal)
	#define DEFINE_MKX_MASTER(a,b,c,d,e) DEFINE_xxx_MASTER(a,b,d,e,EBML _SemanticGlobal)	#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_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_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,EB ML_SemanticGlobal)	#define DEFINE_MKX_UINTEGER(a,b,c,d,e) DEFINE_xxx_UINTEGER(a,b,d,e,EB ML_SemanticGlobal)
	#define DEFINE_MKX_SINTEGER(a,b,c,d,e) DEFINE_xxx_SINTEGER(a,b,d,e,EB ML_SemanticGlobal)	#define DEFINE_MKX_SINTEGER(a,b,c,d,e) DEFINE_xxx_SINTEGER(a,b,d,e,EB ML_SemanticGlobal)
	#define DEFINE_MKX_SINTEGER_CONS(a,b,c,d,e) DEFINE_xxx_SINTEGER_CONS(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)
	#define DEFINE_MKX_STRING_DEF(a,b,c,d,e,v) DEFINE_xxx_STRING_DEF(a,b,d,e, EBML_SemanticGlobal,v)	#define DEFINE_MKX_STRING_DEF(a,b,c,d,e,v) DEFINE_xxx_STRING_DEF(a,b,d,e, EBML_SemanticGlobal,v)
	#define DEFINE_MKX_STRING(a,b,c,d,e) DEFINE_xxx_STRING(a,b,d,e,EBML _SemanticGlobal)	#define DEFINE_MKX_STRING(a,b,c,d,e) DEFINE_xxx_STRING(a,b,d,e,EBML _SemanticGlobal)
	#define DEFINE_MKX_UNISTRING(a,b,c,d,e) DEFINE_xxx_UNISTRING(a,b,d,e,E BML_SemanticGlobal)	#define DEFINE_MKX_UNISTRING(a,b,c,d,e) DEFINE_xxx_UNISTRING(a,b,d,e,E BML_SemanticGlobal)
	#define DEFINE_MKX_BINARY(a,b,c,d,e) DEFINE_xxx_BINARY(a,b,d,e,EBML _SemanticGlobal)	#define DEFINE_MKX_BINARY(a,b,c,d,e) DEFINE_xxx_BINARY(a,b,d,e,EBML _SemanticGlobal)
	#define DEFINE_MKX_BINARY_CONS(a,b,c,d,e) DEFINE_xxx_BINARY_CONS(a,b,d,e ,EBML_SemanticGlobal)	#define DEFINE_MKX_BINARY_CONS(a,b,c,d,e) DEFINE_xxx_BINARY_CONS(a,b,d,e ,EBML_SemanticGlobal)
	#define DEFINE_MKX_FLOAT_DEF(a,b,c,d,e,v) DEFINE_xxx_FLOAT_DEF(a,b,d,e,E BML_SemanticGlobal,v)	#define DEFINE_MKX_FLOAT_DEF(a,b,c,d,e,v) DEFINE_xxx_FLOAT_DEF(a,b,d,e,E BML_SemanticGlobal,v)
	#define DEFINE_MKX_FLOAT(a,b,c,d,e) DEFINE_xxx_FLOAT(a,b,d,e,EBML_ SemanticGlobal)	#define DEFINE_MKX_FLOAT(a,b,c,d,e) DEFINE_xxx_FLOAT(a,b,d,e,EBML_ SemanticGlobal)

	skipping to change at line 132	skipping to change at line 133
	public: x(EBML_EXTRA_PARAM); \	public: x(EBML_EXTRA_PARAM); \
	x(const x & ElementToClone) :EbmlFloat(ElementToClone) {} \	x(const x & ElementToClone) :EbmlFloat(ElementToClone) {} \
	EBML_CONCRETE_CLASS(x)	EBML_CONCRETE_CLASS(x)

	#else	#else
	#define DEFINE_MKX_CONTEXT(a) DEFINE_xxx_CONTEXT(a,*GetKaxGl obal_Context)	#define DEFINE_MKX_CONTEXT(a) DEFINE_xxx_CONTEXT(a,*GetKaxGl obal_Context)
	#define DEFINE_MKX_MASTER_CONS(a,b,c,d,e) DEFINE_xxx_MASTER_CONS(a,b,c,d ,e,*GetKaxGlobal_Context)	#define DEFINE_MKX_MASTER_CONS(a,b,c,d,e) DEFINE_xxx_MASTER_CONS(a,b,c,d ,e,*GetKaxGlobal_Context)
	#define DEFINE_MKX_MASTER(a,b,c,d,e) DEFINE_xxx_MASTER(a,b,c,d,e,*G etKaxGlobal_Context)	#define DEFINE_MKX_MASTER(a,b,c,d,e) DEFINE_xxx_MASTER(a,b,c,d,e,*G etKaxGlobal_Context)
	#define DEFINE_MKX_MASTER_ORPHAN(a,b,c,d) DEFINE_xxx_MASTER_ORPHAN(a,b,c ,d,*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_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,*Ge tKaxGlobal_Context)	#define DEFINE_MKX_UINTEGER(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)
	#define DEFINE_MKX_SINTEGER(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)	#define DEFINE_MKX_SINTEGER(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)
	#define DEFINE_MKX_STRING_DEF(a,b,c,d,e,v) DEFINE_xxx_STRING_DEF(a,b,c,d, e,*GetKaxGlobal_Context,v)	#define DEFINE_MKX_STRING_DEF(a,b,c,d,e,v) DEFINE_xxx_STRING_DEF(a,b,c,d, e,*GetKaxGlobal_Context,v)
	#define DEFINE_MKX_STRING(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)	#define DEFINE_MKX_STRING(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)
	#define DEFINE_MKX_UNISTRING(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)	#define DEFINE_MKX_UNISTRING(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)
	#define DEFINE_MKX_BINARY(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)	#define DEFINE_MKX_BINARY(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)
	#define DEFINE_MKX_FLOAT_DEF(a,b,c,d,e,v) DEFINE_xxx_FLOAT_DEF(a,b,c,d,e ,*GetKaxGlobal_Context,v)	#define DEFINE_MKX_FLOAT_DEF(a,b,c,d,e,v) DEFINE_xxx_FLOAT_DEF(a,b,c,d,e ,*GetKaxGlobal_Context,v)
	#define DEFINE_MKX_FLOAT(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)	#define DEFINE_MKX_FLOAT(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)
	#define DEFINE_MKX_DATE(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)	#define DEFINE_MKX_DATE(a,b,c,d,e) DEFINE_xxx_CLASS(a,b,c,d,e,*Ge tKaxGlobal_Context)
	#define DEFINE_MKX_BINARY_CONS(a,b,c,d,e) DEFINE_xxx_CLASS_CONS(a,b,c,d, e,*GetKaxGlobal_Context)	#define DEFINE_MKX_BINARY_CONS(a,b,c,d,e) DEFINE_xxx_CLASS_CONS(a,b,c,d, e,*GetKaxGlobal_Context)

End of changes. 3 change blocks.
	1 lines changed or deleted	3 lines changed or added