[SCM] libmatroska/master: Imported Upstream version 1.3.0
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Wed Oct 5 11:44:36 UTC 2011
The following commit has been merged in the master branch:
commit a4b45d674da8742c83a9631e9f7d47dd9cc1fc5d
Author: Matteo F. Vescovi <m.vescovi at revese.it>
Date: Wed Oct 5 13:30:23 2011 +0200
Imported Upstream version 1.3.0
diff --git a/ChangeLog b/ChangeLog
index 291b5ad..823ff7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-23 robux4/mosu
+New 1.3.0 version:
+ - initialize all data members
+ - The KaxCodeVersion variable now resides in the library instead of being declared static in the header file.
+ - make KaxChapterSegmentEditionUID an unsigned integer to match the KaxChapterEditionUID it's supposed to target
+ - This release is not binary compatible to 1.2.x.
+
2011-06-26 robux4/mosu
New 1.2.0 version:
- skip data from KaxBlockVirtual as it should not be used
@@ -988,7 +995,7 @@ New 0.9.0 version:
* trunk/libmatroska/matroska/KaxVersion.h: test SSL authentication
-2004-07-08 12:02
+2004-07-08 12:02
* trunk/libmatroska/matroska/KaxVersion.h: Test changes
diff --git a/debian/changelog b/debian/changelog
index 6343c2e..e487a91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libmatroska (1.3.0-1) natty; urgency=low
+
+ * New version.
+
+ -- Moritz Bunkus <moritz at bunkus.org> Fri, 23 Sep 2011 13:54:26 +0200
+
libmatroska (1.2.0-1) natty; urgency=low
* New version.
diff --git a/libmatroska.proj b/libmatroska.proj
index c4bacca..520872e 100644
--- a/libmatroska.proj
+++ b/libmatroska.proj
@@ -2,7 +2,7 @@
LIB matroska
{
- PROJECT_VERSION 1.2.0
+ PROJECT_VERSION 1.3.0
INCLUDE .
EXPINCLUDE .
diff --git a/make/linux/Makefile b/make/linux/Makefile
index 71e42ac..c678e28 100644
--- a/make/linux/Makefile
+++ b/make/linux/Makefile
@@ -54,7 +54,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
# Names
LIBRARY=libmatroska.a
LIBRARY_SO=libmatroska.so
-LIBRARY_SO_VER=libmatroska.so.4
+LIBRARY_SO_VER=libmatroska.so.5
# source-files
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
diff --git a/make/linux/fedora-core.spec b/make/linux/fedora-core.spec
index 53bcfc0..43aafd1 100644
--- a/make/linux/fedora-core.spec
+++ b/make/linux/fedora-core.spec
@@ -1,7 +1,7 @@
# SPEC file for (at least) Fedora Core 1, 2, 3
Name: libmatroska
-Version: 1.2.0
+Version: 1.3.0
Release: 1
License: LGPL
Summary: Matroska Video Container
diff --git a/make/linux/suse.spec b/make/linux/suse.spec
index 9f4da81..fd879c6 100644
--- a/make/linux/suse.spec
+++ b/make/linux/suse.spec
@@ -14,7 +14,7 @@ BuildRequires: bzip2 cpp libebml make tar zlib zlib-devel binutils gcc gcc-c++ l
Name: libmatroska
URL: http://dl.matroska.org/downloads/libmatroska/
-Version: 1.2.0
+Version: 1.3.0
Release: 1
Summary: library to deal with matroska files.
License: LGPL
diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h
index d1d7973..564bec4 100644
--- a/matroska/KaxSemantic.h
+++ b/matroska/KaxSemantic.h
@@ -607,9 +607,7 @@ public:
virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
};
-DECLARE_MKX_BINARY (KaxChapterSegmentEditionUID)
-public:
- virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
+DECLARE_MKX_UINTEGER(KaxChapterSegmentEditionUID)
};
DECLARE_MKX_UINTEGER(KaxChapterPhysicalEquiv)
diff --git a/matroska/KaxVersion.h b/matroska/KaxVersion.h
index 11233d8..c84b844 100644
--- a/matroska/KaxVersion.h
+++ b/matroska/KaxVersion.h
@@ -40,10 +40,10 @@
START_LIBMATROSKA_NAMESPACE
-#define LIBMATROSKA_VERSION 0x010200
+#define LIBMATROSKA_VERSION 0x010300
-static const std::string KaxCodeVersion = "1.2.0";
-static const std::string KaxCodeDate = __TIMESTAMP__;
+extern const std::string KaxCodeVersion;
+extern const std::string KaxCodeDate;
/*!
\todo Improve the CRC/ECC system (backward and forward possible ?) to fit streaming/live writing/simple reading
diff --git a/src/KaxBlockData.cpp b/src/KaxBlockData.cpp
index f0de31d..d41c4f2 100644
--- a/src/KaxBlockData.cpp
+++ b/src/KaxBlockData.cpp
@@ -52,12 +52,16 @@ KaxReferenceBlock::KaxReferenceBlock(EBML_EXTRA_DEF)
:EBML_DEF_SINTEGER(KaxReferenceBlock)EBML_DEF_SEP
RefdBlock(NULL)
,ParentBlock(NULL)
+,bTimecodeSet(false)
+,bOurBlob(false)
{
bTimecodeSet = false;
}
KaxReferenceBlock::KaxReferenceBlock(const KaxReferenceBlock & ElementToClone)
:EbmlSInteger(ElementToClone)
+,RefdBlock(NULL)
+,ParentBlock(NULL)
,bTimecodeSet(ElementToClone.bTimecodeSet)
,bOurBlob(false)
{
diff --git a/src/KaxCues.cpp b/src/KaxCues.cpp
index a3c9f70..5e877a4 100644
--- a/src/KaxCues.cpp
+++ b/src/KaxCues.cpp
@@ -120,7 +120,6 @@ const KaxCuePoint * KaxCues::GetTimecodePoint(uint64 aTimecode) const
uint64 TimecodeToLocate = aTimecode / GlobalTimecodeScale();
const KaxCuePoint * aPointPrev = NULL;
uint64 aPrevTime = 0;
- const KaxCuePoint * aPointNext = NULL;
uint64 aNextTime = EBML_PRETTYLONGINT(0xFFFFFFFFFFFF);
EBML_MASTER_CONST_ITERATOR Itr;
@@ -139,7 +138,6 @@ const KaxCuePoint * KaxCues::GetTimecodePoint(uint64 aTimecode) const
}
if (_Time < aNextTime && _Time > TimecodeToLocate) {
aNextTime= _Time;
- aPointNext = tmp;
}
}
}
diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp
index 29be7d1..a5b555f 100644
--- a/src/KaxSemantic.cpp
+++ b/src/KaxSemantic.cpp
@@ -580,7 +580,7 @@ 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(KaxChapterSegmentEditionUID, 0x6EBC, 2, KaxChapterAtom, "ChapterSegmentEditionUID");
DEFINE_MKX_UINTEGER(KaxChapterPhysicalEquiv, 0x63C3, 2, KaxChapterAtom, "ChapterPhysicalEquiv");
DEFINE_START_SEMANTIC(KaxChapterTrack)
diff --git a/src/KaxVersion.cpp b/src/KaxVersion.cpp
index 8900112..edf8e77 100644
--- a/src/KaxVersion.cpp
+++ b/src/KaxVersion.cpp
@@ -11,12 +11,12 @@
** 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
@@ -37,4 +37,7 @@
START_LIBMATROSKA_NAMESPACE
+const std::string KaxCodeVersion = "1.3.0";
+const std::string KaxCodeDate = __TIMESTAMP__;
+
END_LIBMATROSKA_NAMESPACE
--
libmatroska packaging
More information about the pkg-multimedia-commits
mailing list