Merge changes I16364ecf,I99780547
* changes:
mkv{muxer,parser}: bump version #s for next tag
*.cmake: remove redundant cmake_minimum_required()
diff --git a/build/cxx_flags.cmake b/build/cxx_flags.cmake
index 9e96889..1aa6a86 100644
--- a/build/cxx_flags.cmake
+++ b/build/cxx_flags.cmake
@@ -5,7 +5,6 @@
## tree. An additional intellectual property rights grant can be found
## in the file PATENTS. All contributing project authors may
## be found in the AUTHORS file in the root of the source tree.
-cmake_minimum_required(VERSION 3.2)
include(CheckCXXCompilerFlag)
diff --git a/build/msvc_runtime.cmake b/build/msvc_runtime.cmake
index d7d7add..4f53a36 100644
--- a/build/msvc_runtime.cmake
+++ b/build/msvc_runtime.cmake
@@ -5,7 +5,6 @@
## tree. An additional intellectual property rights grant can be found
## in the file PATENTS. All contributing project authors may
## be found in the AUTHORS file in the root of the source tree.
-cmake_minimum_required(VERSION 2.8)
if (MSVC)
# CMake defaults to producing code linked to the DLL MSVC runtime. In libwebm
diff --git a/mkvmuxer/mkvmuxerutil.cc b/mkvmuxer/mkvmuxerutil.cc
index 6436817..bd2f769 100644
--- a/mkvmuxer/mkvmuxerutil.cc
+++ b/mkvmuxer/mkvmuxerutil.cc
@@ -606,8 +606,8 @@
void GetVersion(int32* major, int32* minor, int32* build, int32* revision) {
*major = 0;
- *minor = 2;
- *build = 1;
+ *minor = 3;
+ *build = 0;
*revision = 0;
}
diff --git a/mkvparser/mkvparser.cc b/mkvparser/mkvparser.cc
index d9050b9..e7cf332 100644
--- a/mkvparser/mkvparser.cc
+++ b/mkvparser/mkvparser.cc
@@ -54,9 +54,9 @@
void GetVersion(int& major, int& minor, int& build, int& revision) {
major = 1;
- minor = 0;
+ minor = 1;
build = 0;
- revision = 30;
+ revision = 0;
}
long long ReadUInt(IMkvReader* pReader, long long pos, long& len) {
