diff options
| author | John Hurst <jhurst@cinecert.com> | 2019-02-21 16:11:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-21 16:11:02 -0800 |
| commit | 5eebd12b285b6f6117e307cd116a9bb644218b79 (patch) | |
| tree | 348f8416278828e06be696324a9469ad5b002a26 | |
| parent | 58628942da20e483f5c3076d6c14ff4bef71fc71 (diff) | |
| parent | c22d49a2d1bc4ee13c36484b22de2032015c7830 (diff) | |
Merge pull request #1 from wruppelx/master
CMake fixed
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/MDD.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d75a4d7..cf5b240 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,9 +3,8 @@ cmake_minimum_required(VERSION 2.8.12) project(asdcplib) # The version number. -file(STRINGS configure VERSION_STRING REGEX "PACKAGE_VERSION=.*") -STRING(REGEX REPLACE "(.*)([\n*[.]]+).*" "\\2" ${VERSION_STRING} "${${VERSION_STRING}}") -STRING(REGEX REPLACE "(PACKAGE_VERSION=')(.*)'" "\\2" VERSION_STRING ${VERSION_STRING}) +file(STRINGS configure.ac VERSION_STRING REGEX "AC_INIT.*") +STRING(REGEX MATCH "[0-9]*[\\.][0-9]*[\\.][0-9]*" VERSION_STRING ${VERSION_STRING}) STRING(REGEX REPLACE "([0-9]+)[.].*" "\\1" VERSION_MAJOR ${VERSION_STRING}) STRING(REGEX REPLACE ".*[.]([0-9]+)[.].*" "\\1" VERSION_MINOR ${VERSION_STRING}) STRING(REGEX REPLACE ".*[.]+([0-9]+)" "\\1" VERSION_PATCH ${VERSION_STRING}) diff --git a/src/MDD.cpp b/src/MDD.cpp index 7a284e4..c8de004 100644 --- a/src/MDD.cpp +++ b/src/MDD.cpp @@ -1537,7 +1537,7 @@ static const ASDCP::MDDEntry s_MDD_Table[] = { { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x05, // 494 0x0e, 0x09, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00 }, {0}, false, "ISXDDataEssenceDescriptor" }, - { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05, // 495 + { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x05, // 495 0x0e, 0x09, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00 }, {0}, false, "ISXDDataEssenceDescriptor_NamespaceURI" }, { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05, // 496 |