libmatroska: headers diff between 1.0.0 and 1.1.0 versions

	KaxBlock.h	KaxBlock.h

	skipping to change at line 61	skipping to change at line 61
	class KaxReferenceBlock;	class KaxReferenceBlock;
	class KaxInternalBlock;	class KaxInternalBlock;
	class KaxBlockBlob;	class KaxBlockBlob;

	class MATROSKA_DLL_API DataBuffer {	class MATROSKA_DLL_API DataBuffer {
	protected:	protected:
	binary * myBuffer;	binary * myBuffer;
	uint32 mySize;	uint32 mySize;
	bool bValidValue;	bool bValidValue;
	bool (*myFreeBuffer)(const DataBuffer & aBuffer); // met hod to free the internal buffer	bool (*myFreeBuffer)(const DataBuffer & aBuffer); // met hod to free the internal buffer

		bool bInternalBuffer;

	public:	public:

	DataBuffer(binary * aBuffer, uint32 aSize, bool (*aFreeBuffe	DataBuffer(binary * aBuffer, uint32 aSize, bool (*aFreeBuffe
	r)(const DataBuffer & aBuffer) = NULL)	r)(const DataBuffer & aBuffer) = NULL, bool _bInternalBuffer = false)
	:myBuffer(aBuffer)	:myBuffer(NULL)
	,mySize(aSize)	,mySize(aSize)
	,bValidValue(true)	,bValidValue(true)

	,myFreeBuffer(aFreeBuffer)	,myFreeBuffer(aFreeBuffer)
	{}	,bInternalBuffer(_bInternalBuffer)
		{
		if (bInternalBuffer)
		{
		myBuffer = new binary[mySize];
		if (myBuffer == NULL)
		bValidValue = false;
		else
		memcpy(myBuffer, aBuffer, mySize);
		}
		else
		myBuffer = aBuffer;
		}

	virtual ~DataBuffer() {}	virtual ~DataBuffer() {}

	virtual binary * Buffer() {return myBuffer;}	virtual binary * Buffer() {assert(bValidValue); return myBuf fer;}
	virtual uint32 & Size() {return mySize;};	virtual uint32 & Size() {return mySize;};

	virtual const binary * Buffer() const {return myBuffer;}	virtual const binary * Buffer() const {assert(bValidValue); return myBuffer;}
	virtual const uint32 Size() const {return mySize;};	virtual const uint32 Size() const {return mySize;};
	bool FreeBuffer(const DataBuffer & aBuffer) {	bool FreeBuffer(const DataBuffer & aBuffer) {
	bool bResult = true;	bool bResult = true;

	if (myBuffer != NULL && myFreeBuffer != NULL && bVal	if (myBuffer != NULL && bValidValue) {
	idValue) {	if (myFreeBuffer != NULL)
	bResult = myFreeBuffer(aBuffer);	bResult = myFreeBuffer(aBuffer);
		if (bInternalBuffer)
		delete [] myBuffer;
	myBuffer = NULL;	myBuffer = NULL;

		mySize = 0;
	bValidValue = false;	bValidValue = false;
	}	}
	return bResult;	return bResult;
	}	}

	virtual DataBuffer * Clone();	virtual DataBuffer * Clone();
	};	};

	class MATROSKA_DLL_API SimpleDataBuffer : public DataBuffer {	class MATROSKA_DLL_API SimpleDataBuffer : public DataBuffer {
	public:	public:

	skipping to change at line 291	skipping to change at line 309
	public:	public:
	KaxSimpleBlock(EBML_EXTRA_PARAM) :KaxInternalBlock(EBML_DEF_ BINARY_CTX(KaxSimpleBlock)EBML_DEF_SEP true EBML_DEF_SEP EBML_EXTRA_CALL) { }	KaxSimpleBlock(EBML_EXTRA_PARAM) :KaxInternalBlock(EBML_DEF_ BINARY_CTX(KaxSimpleBlock)EBML_DEF_SEP true EBML_DEF_SEP EBML_EXTRA_CALL) { }

	void SetKeyframe(bool b_keyframe) { bIsKeyframe = b_keyframe ; }	void SetKeyframe(bool b_keyframe) { bIsKeyframe = b_keyframe ; }
	void SetDiscardable(bool b_discard) { bIsDiscardable = b_dis card; }	void SetDiscardable(bool b_discard) { bIsDiscardable = b_dis card; }

	bool IsKeyframe() const { return bIsKeyframe; }	bool IsKeyframe() const { return bIsKeyframe; }
	bool IsDiscardable() const { return bIsDiscardable; }	bool IsDiscardable() const { return bIsDiscardable; }

	operator KaxInternalBlock &() { return *this; }	operator KaxInternalBlock &() { return *this; }

		void SetParent(KaxCluster & aParentCluster);

	EBML_CONCRETE_CLASS(KaxSimpleBlock)	EBML_CONCRETE_CLASS(KaxSimpleBlock)
	};	};
	#endif // MATROSKA_VERSION	#endif // MATROSKA_VERSION


		/// Placeholder class for either a BlockGroup or a SimpleBlock
	class MATROSKA_DLL_API KaxBlockBlob {	class MATROSKA_DLL_API KaxBlockBlob {
	public:	public:
	KaxBlockBlob(BlockBlobType sblock_mode) :ParentCluster(NULL), Simple BlockMode(sblock_mode) {	KaxBlockBlob(BlockBlobType sblock_mode) :ParentCluster(NULL), Simple BlockMode(sblock_mode) {
	bUseSimpleBlock = (sblock_mode != BLOCK_BLOB_NO_SIMPLE);	bUseSimpleBlock = (sblock_mode != BLOCK_BLOB_NO_SIMPLE);
	Block.group = NULL;	Block.group = NULL;
	}	}

	~KaxBlockBlob() {	~KaxBlockBlob() {
	#if MATROSKA_VERSION >= 2	#if MATROSKA_VERSION >= 2
	if (bUseSimpleBlock)	if (bUseSimpleBlock)

End of changes. 9 change blocks.
	10 lines changed or deleted	29 lines changed or added

	KaxBlockData.h	KaxBlockData.h

	skipping to change at line 58	skipping to change at line 58
	class KaxBlockBlob;	class KaxBlockBlob;

	DECLARE_MKX_UINTEGER(KaxReferencePriority)	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();
	/*!	/*!
	\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);

	const KaxBlockBlob & RefBlock() const;	const KaxBlockBlob & RefBlock() const;
	void SetReferencedBlock(const KaxBlockBlob * aRefdBlock);	void SetReferencedBlock(const KaxBlockBlob * aRefdBlock);
	void SetReferencedBlock(const KaxBlockGroup & aRefdBlock);	void SetReferencedBlock(const KaxBlockGroup & aRefdBlock);
	void SetParentBlock(const KaxBlockGroup & aParentBlock) {Par entBlock = &aParentBlock;}	void SetParentBlock(const KaxBlockGroup & aParentBlock) {Par entBlock = &aParentBlock;}

	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;
		void FreeBlob();
	};	};

	#if MATROSKA_VERSION >= 2	#if MATROSKA_VERSION >= 2
	DECLARE_MKX_SINTEGER(KaxReferenceVirtual)	DECLARE_MKX_SINTEGER(KaxReferenceVirtual)
	};	};
	#endif // MATROSKA_VERSION	#endif // MATROSKA_VERSION

	DECLARE_MKX_MASTER(KaxTimeSlice)	DECLARE_MKX_MASTER(KaxTimeSlice)
	};	};


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

	KaxCues.h	KaxCues.h

	skipping to change at line 54	skipping to change at line 54
	using namespace LIBEBML_NAMESPACE;	using namespace LIBEBML_NAMESPACE;

	START_LIBMATROSKA_NAMESPACE	START_LIBMATROSKA_NAMESPACE

	class KaxCuePoint;	class KaxCuePoint;

	DECLARE_MKX_MASTER(KaxCues)	DECLARE_MKX_MASTER(KaxCues)
	public:	public:
	~KaxCues();	~KaxCues();


	bool AddBlockGroup(const KaxBlockGroup & BlockReference);	//bool AddBlockGroup(const KaxBlockGroup & BlockReference); // deprecated
	bool AddBlockBlob(const KaxBlockBlob & BlockReference);	bool AddBlockBlob(const KaxBlockBlob & BlockReference);

	/*!	/*!
	\brief Indicate that the position for this Block is set	\brief Indicate that the position for this Block is set
	*/	*/
	void PositionSet(const KaxBlockGroup & BlockReference);	void PositionSet(const KaxBlockGroup & BlockReference);
	void PositionSet(const KaxBlockBlob & BlockReference);	void PositionSet(const KaxBlockBlob & BlockReference);

	/*!	/*!
	\brief override to sort by timecode/track	\brief override to sort by timecode/track

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

	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 295 2010-06-04 11:03:46Z robux4 $	\version \$Id: KaxDefines.h 353 2010-06-27 05:24: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)	#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_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)

End of changes. 2 change blocks.
	2 lines changed or deleted	2 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 295 2010-06-04 11:03:46Z robux4 $	\version \$Id: KaxInfoData.h 353 2010-06-27 05:24: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"

	skipping to change at line 55	skipping to change at line 55
	#include "ebml/EbmlDate.h"	#include "ebml/EbmlDate.h"
	#include "ebml/EbmlMaster.h"	#include "ebml/EbmlMaster.h"
	#include "matroska/KaxDefines.h"	#include "matroska/KaxDefines.h"

	using namespace LIBEBML_NAMESPACE;	using namespace LIBEBML_NAMESPACE;

	START_LIBMATROSKA_NAMESPACE	START_LIBMATROSKA_NAMESPACE

	DECLARE_MKX_BINARY(KaxSegmentUID)	DECLARE_MKX_BINARY(KaxSegmentUID)
	public:	public:

	#if defined(HAVE_EBML2)	#if defined(HAVE_EBML2) \|\| defined(HAS_EBML2)
	KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_PARAM);	KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_PARAM);
	#endif	#endif
	virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}	virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}
	};	};

	DECLARE_MKX_UNISTRING(KaxSegmentFilename)	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 {

End of changes. 2 change blocks.
	2 lines changed or deleted	2 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 270 2010-05-25 12:02:30Z robux4 $	\version \$Id: KaxTag.h 385 2010-07-04 09:32:26Z robux4 $
	\author Jory Stone <jcsston @ toughguy.net>	\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/KaxTypes.h"
	#include "ebml/EbmlMaster.h"	#include "ebml/EbmlMaster.h"
	#include "ebml/EbmlFloat.h"	#include "ebml/EbmlFloat.h"
	#include "ebml/EbmlSInteger.h"	#include "ebml/EbmlSInteger.h"

	skipping to change at line 59	skipping to change at line 59
	using namespace LIBEBML_NAMESPACE;	using namespace LIBEBML_NAMESPACE;

	START_LIBMATROSKA_NAMESPACE	START_LIBMATROSKA_NAMESPACE

	DECLARE_MKX_MASTER(KaxTag)	DECLARE_MKX_MASTER(KaxTag)
	};	};

	DECLARE_MKX_MASTER(KaxTagTargets)	DECLARE_MKX_MASTER(KaxTagTargets)
	};	};


	DECLARE_MKX_MASTER(KaxTagGeneral)
	};

	DECLARE_MKX_MASTER(KaxTagGenres)
	};

	DECLARE_MKX_MASTER(KaxTagAudioSpecific)
	};

	DECLARE_MKX_MASTER(KaxTagImageSpecific)
	};

	DECLARE_MKX_UINTEGER(KaxTagTargetTypeValue)	DECLARE_MKX_UINTEGER(KaxTagTargetTypeValue)
	};	};

	DECLARE_MKX_STRING(KaxTagTargetType)	DECLARE_MKX_STRING(KaxTagTargetType)
	};	};

	DECLARE_MKX_UINTEGER(KaxTagTrackUID)	DECLARE_MKX_UINTEGER(KaxTagTrackUID)
	};	};

	DECLARE_MKX_UINTEGER(KaxTagEditionUID)	DECLARE_MKX_UINTEGER(KaxTagEditionUID)
	};	};

	DECLARE_MKX_UINTEGER(KaxTagChapterUID)	DECLARE_MKX_UINTEGER(KaxTagChapterUID)
	};	};

	DECLARE_MKX_UINTEGER(KaxTagAttachmentUID)	DECLARE_MKX_UINTEGER(KaxTagAttachmentUID)
	};	};


	DECLARE_MKX_UNISTRING(KaxTagArchivalLocation)
	};

	DECLARE_MKX_BINARY(KaxTagAudioEncryption)
	};

	DECLARE_MKX_FLOAT(KaxTagAudioGain)
	};

	DECLARE_MKX_STRING(KaxTagAudioGenre)
	};

	DECLARE_MKX_FLOAT(KaxTagAudioPeak)
	};

	DECLARE_MKX_UNISTRING(KaxTagBibliography)
	};

	DECLARE_MKX_FLOAT(KaxTagBPM)
	};

	DECLARE_MKX_UINTEGER(KaxTagCaptureDPI)
	};

	DECLARE_MKX_BINARY(KaxTagCaptureLightness)
	};

	DECLARE_MKX_UINTEGER(KaxTagCapturePaletteSetting)
	};

	DECLARE_MKX_BINARY(KaxTagCaptureSharpness)
	};

	DECLARE_MKX_UNISTRING(KaxTagCropped)
	};

	DECLARE_MKX_UINTEGER(KaxTagDiscTrack)
	};

	DECLARE_MKX_UNISTRING(KaxTagEncoder)
	};

	DECLARE_MKX_UNISTRING(KaxTagEncodeSettings)
	};

	DECLARE_MKX_BINARY(KaxTagEqualisation)
	};

	DECLARE_MKX_UNISTRING(KaxTagFile)
	};

	DECLARE_MKX_STRING(KaxTagInitialKey)
	};

	DECLARE_MKX_UNISTRING(KaxTagKeywords)
	};

	DECLARE_MKX_STRING(KaxTagLanguage)	DECLARE_MKX_STRING(KaxTagLanguage)
	};	};


	DECLARE_MKX_UINTEGER(KaxTagLength)
	};

	DECLARE_MKX_UNISTRING(KaxTagMood)
	};

	DECLARE_MKX_STRING(KaxTagOfficialAudioFileURL)
	};

	DECLARE_MKX_STRING(KaxTagOfficialAudioSourceURL)
	};

	DECLARE_MKX_STRING(KaxTagOriginalDimensions)
	};

	DECLARE_MKX_UNISTRING(KaxTagOriginalMediaType)
	};

	DECLARE_MKX_UINTEGER(KaxTagPlayCounter)
	};

	DECLARE_MKX_UINTEGER(KaxTagPlaylistDelay)
	};

	DECLARE_MKX_SINTEGER(KaxTagPopularimeter)
	};

	DECLARE_MKX_UNISTRING(KaxTagProduct)
	};

	DECLARE_MKX_BINARY(KaxTagRating)
	};

	DECLARE_MKX_STRING(KaxTagRecordLocation)
	};

	DECLARE_MKX_UINTEGER(KaxTagSetPart)
	};

	DECLARE_MKX_UNISTRING(KaxTagSource)
	};

	DECLARE_MKX_UNISTRING(KaxTagSourceForm)
	};

	DECLARE_MKX_STRING(KaxTagSubGenre)
	};

	DECLARE_MKX_UNISTRING(KaxTagSubject)
	};

	DECLARE_MKX_UNISTRING(KaxTagUnsynchronisedText)
	};

	DECLARE_MKX_STRING(KaxTagUserDefinedURL)
	};

	DECLARE_MKX_BINARY(KaxTagVideoGenre)
	public:
	virtual bool ValidateSize() const {return IsFiniteSize() &&
	(GetSize() >= 2);}
	};

	DECLARE_MKX_MASTER(KaxTagSimple)	DECLARE_MKX_MASTER(KaxTagSimple)
	};	};

	DECLARE_MKX_UNISTRING(KaxTagName)	DECLARE_MKX_UNISTRING(KaxTagName)
	};	};

	DECLARE_MKX_STRING(KaxTagLangue)	DECLARE_MKX_STRING(KaxTagLangue)
	};	};

	DECLARE_MKX_UINTEGER(KaxTagDefault)	DECLARE_MKX_UINTEGER(KaxTagDefault)

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

	KaxTracks.h	KaxTracks.h

	skipping to change at line 79	skipping to change at line 79
	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. 1 change blocks.
	0 lines changed or deleted	23 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 0x010000	#define LIBMATROSKA_VERSION 0x010100


	static const std::string KaxCodeVersion = "1.0.0";	static const std::string KaxCodeVersion = "1.1.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/