Merge pull request #1431 from g-maxime/preparing-v21.09

Preparing v21.09
MediaArea · Sep 17, 2021 · 8f5d381 · 8f5d381
2 parents ba2eda6 + e387c5a
commit 8f5d381
Show file tree

Hide file tree

Showing 25 changed files with 87 additions and 72 deletions.
diff --git a/History_DLL.txt b/History_DLL.txt
@@ -7,6 +7,21 @@ x Correction
 bug reports and feature request are here:
 https://sourceforge.net/p/mediainfo/_list/tickets
 
+Version 21.09, 2021-09-17
+-------------
++ Graph view for 3D audio streams (thanks to graphviz)
++ ADM: full featured support (programmes, content, objects, pack formats...)
++ ADM: in WAV (axml, bxml), MXF
++ S-ADM in AES3: support of Levels A1 and AX1
++ MOV/MP4: support of Dolby Vision Metadata XML
++ MXF: detection of IAB
++ SMPTE ST 337 (AES3): support of subframe mode
++ HEVC: CEA-608/708 caption support
++ MP4/QuickTime: Android slow motion real frame rate
++ JSON output: add creatingLibrary field
+x MPEG-4: read too much data with some predecessor definitions
+x EBUCore: fix of fields order and types
+
 Version 21.03, 2021-03-26
 -------------
 + WAV: ADM profile detection of Dolby Atmos Master or MPEG-H

diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
@@ -5,7 +5,7 @@ project(MediaInfoLib)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
 
 set(MediaInfoLib_MAJOR_VERSION 21)
-set(MediaInfoLib_MINOR_VERSION 03)
+set(MediaInfoLib_MINOR_VERSION 09)
 set(MediaInfoLib_PATCH_VERSION 0)
 set(MediaInfoLib_VERSION ${MediaInfoLib_MAJOR_VERSION}.${MediaInfoLib_MINOR_VERSION})
 

diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
@@ -5,7 +5,7 @@ dnl #########################################################################
 dnl -------------------------------------------------------------------------
 dnl Name and version
 dnl
-AC_INIT([libmediainfo], [21.03])
+AC_INIT([libmediainfo], [21.09])
 
 dnl -------------------------------------------------------------------------
 dnl Test if we are at the good place

diff --git a/Project/GNU/PKGBUILD b/Project/GNU/PKGBUILD
@@ -3,14 +3,14 @@
 # Contributor: hydro <[email protected]>
 
 pkgname=('libmediainfo' 'python2-mediainfo' 'python-mediainfo')
-pkgver=21.03
+pkgver=21.09
 pkgrel=1
 pkgdesc="shared library for mediainfo"
 arch=('i686' 'x86_64')
 url="http://mediaarea.net"
 license=('BSD-2-Clause')
 makedepends=('libtool' 'automake' 'autoconf' 'python' 'python2')
-depends=( 'curl' 'libmms' 'libzen>=0.4.37')
+depends=( 'curl' 'libmms' 'libzen>=0.4.39')
 source=(${pkgname}_${pkgver}.orig.tar.xz)
 md5sums=('00000000000000000000000000000000')
 

diff --git a/Project/GNU/libmediainfo.dsc b/Project/GNU/libmediainfo.dsc
@@ -2,25 +2,25 @@ Format: 3.0 (quilt)
 Source: libmediainfo
 Binary: libmediainfo-dev, libmediainfo0, python-mediainfodll, python3-mediainfodll, libmediainfo-doc libmediainfo0-dbg
 Architecture: any all
-Version: 21.03-1
+Version: 21.09-1
 Maintainer: MediaArea.net SARL <[email protected]>
 Homepage: http://MediaArea.net/MediaInfo
 Standards-Version: 3.9.6
 Vcs-Browser: https://github.com/MediaArea/MediaInfoLib
 Vcs-Git: https://github.com/MediaArea/MediaInfoLib.git
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1), python-all (>= 2.6.6-3~), python3-all, dh-autoreconf, doxygen, tofrodos, libzen-dev (>= 0.4.37), libcurl4-gnutls-dev, libmms-dev, libglib2.0-dev, zlib1g-dev, pkg-config
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1), python-all (>= 2.6.6-3~), python3-all, dh-autoreconf, doxygen, tofrodos, libzen-dev (>= 0.4.39), libcurl4-gnutls-dev, libmms-dev, libglib2.0-dev, zlib1g-dev, pkg-config
 Package-List:
  libmediainfo-dev deb libdevel optional arch=any
  libmediainfo-doc deb doc optional arch=all
  libmediainfo0 deb libs optional arch=any
  python-mediainfodll deb python optional arch=all
  python3-mediainfodll deb python optional arch=all
 Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 libmediainfo_21.03.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libmediainfo_21.03-1.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_21.09.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_21.09-1.debian.tar.xz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.03.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.03-1.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.09.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.09-1.debian.tar.xz
 Files:
- 00000000000000000000000000000000 000000 libmediainfo_21.03.orig.tar.xz
- 00000000000000000000000000000000 000000 libmediainfo_21.03-1.debian.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_21.09.orig.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_21.09-1.debian.tar.xz
diff --git a/Project/GNU/libmediainfo.spec b/Project/GNU/libmediainfo.spec
@@ -1,10 +1,10 @@
-%global libmediainfo_version      21.03
+%global libmediainfo_version      21.09
 %global libmediainfo_version_major      21
-%global libmediainfo_version_minor      03
-%global libzen_version            0.4.37
+%global libmediainfo_version_minor      09
+%global libzen_version            0.4.39
 %global libzen_version_major      0
 %global libzen_version_minor      4
-%global libzen_version_release    37
+%global libzen_version_release    39
 
 %if 0%{?fedora_version} || 0%{?centos_version} >= 600 || 0%{?rhel_version} >= 600
 %global package_with_0_ending 0
@@ -411,7 +411,7 @@ rm -f %{buildroot}%{_libdir}/%{name_without_0_ending}.la
 %endif
 
 %changelog
-* Sun Jan 01 2012 MediaArea.net SARL <[email protected]> - 21.03-0
+* Sun Jan 01 2012 MediaArea.net SARL <[email protected]> - 21.09-0
 - See History.txt for more info and real dates
 - Previous packages made by Toni Graffy <[email protected]>
 - Fedora style made by Vasiliy N. Glazov <[email protected]>
diff --git a/Project/MSVC2013/Example/HowToUse.rc b/Project/MSVC2013/Example/HowToUse.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,03,0,0
- PRODUCTVERSION 21,03,0,0
+ FILEVERSION 21,09,0,0
+ PRODUCTVERSION 21,09,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "21.03.0.0"
+            VALUE "FileVersion", "21.09.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.03.0.0"
+            VALUE "ProductVersion", "21.09.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,03,0,0
- PRODUCTVERSION 21,03,0,0
+ FILEVERSION 21,09,0,0
+ PRODUCTVERSION 21,09,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "21.03.0.0"
+            VALUE "FileVersion", "21.09.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.03.0.0"
+            VALUE "ProductVersion", "21.09.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2015/Example/HowToUse.rc b/Project/MSVC2015/Example/HowToUse.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,03,0,0
- PRODUCTVERSION 21,03,0,0
+ FILEVERSION 21,09,0,0
+ PRODUCTVERSION 21,09,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "21.03.0.0"
+            VALUE "FileVersion", "21.09.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.03.0.0"
+            VALUE "ProductVersion", "21.09.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,03,0,0
- PRODUCTVERSION 21,03,0,0
+ FILEVERSION 21,09,0,0
+ PRODUCTVERSION 21,09,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "21.03.0.0"
+            VALUE "FileVersion", "21.09.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.03.0.0"
+            VALUE "ProductVersion", "21.09.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2017/Example/HowToUse.rc b/Project/MSVC2017/Example/HowToUse.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,03,0,0
- PRODUCTVERSION 21,03,0,0
+ FILEVERSION 21,09,0,0
+ PRODUCTVERSION 21,09,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "21.03.0.0"
+            VALUE "FileVersion", "21.09.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.03.0.0"
+            VALUE "ProductVersion", "21.09.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,03,0,0
- PRODUCTVERSION 21,03,0,0
+ FILEVERSION 21,09,0,0
+ PRODUCTVERSION 21,09,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "21.03.0.0"
+            VALUE "FileVersion", "21.09.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.03.0.0"
+            VALUE "ProductVersion", "21.09.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2019/Example/HowToUse.rc b/Project/MSVC2019/Example/HowToUse.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,03,0,0
- PRODUCTVERSION 21,03,0,0
+ FILEVERSION 21,09,0,0
+ PRODUCTVERSION 21,09,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "21.03.0.0"
+            VALUE "FileVersion", "21.09.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.03.0.0"
+            VALUE "ProductVersion", "21.09.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2019/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2019/ShellExtension/MediaInfoShellExt.rc
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "21.03.0.0"
+            VALUE "FileVersion", "21.09.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.03.0.0"
+            VALUE "ProductVersion", "21.09.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/OBS/deb9.debian/changelog b/Project/OBS/deb9.debian/changelog
@@ -1,6 +1,6 @@
-libmediainfo (21.03-1) experimental; urgency=medium
+libmediainfo (21.09-1) experimental; urgency=medium
 
-  * Upstream version 21.03
+  * Upstream version 21.09
     For details, see https://github.com/MediaArea/MediaInfoLib/blob/master/History_DLL.txt
 
  -- MediaArea <[email protected]>  Mon, 02 Nov 2015 10:30:00 +0100

diff --git a/Project/OBS/deb9.debian/control b/Project/OBS/deb9.debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                doxygen,
                tofrodos,
-               libzen-dev (>= 0.4.37),
+               libzen-dev (>= 0.4.39),
                libcurl4-gnutls-dev,
                libmms-dev,
                libglib2.0-dev,
@@ -55,7 +55,7 @@ Package: libmediainfo0v5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, libzen0v5 (>= 0.4.37)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzen0v5 (>= 0.4.39)
 Replaces: libmediainfo0
 Conflicts: libmediainfo0
 Description: library for reading metadata from media files -- shared library

diff --git a/Project/OBS/deb9.dsc b/Project/OBS/deb9.dsc
@@ -2,25 +2,25 @@ Format: 3.0 (quilt)
 Source: libmediainfo
 Binary: libmediainfo-dev, libmediainfo0v5, python-mediainfodll, python3-mediainfodll, libmediainfo-doc libmediainfo0v5-dbg
 Architecture: any all
-Version: 21.03-1deb9
+Version: 21.09-1deb9
 Maintainer: MediaArea.net SARL <[email protected]>
 Homepage: http://MediaArea.net/MediaInfo
 Standards-Version: 3.9.6
 Vcs-Browser: https://github.com/MediaArea/MediaInfoLib
 Vcs-Git: https://github.com/MediaArea/MediaInfoLib.git
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1), python-all (>= 2.6.6-3~), python3-all, dh-python, dh-autoreconf, doxygen, tofrodos, libzen-dev (>= 0.4.37), libcurl4-gnutls-dev, libmms-dev, libglib2.0-dev, zlib1g-dev, pkg-config
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1), python-all (>= 2.6.6-3~), python3-all, dh-python, dh-autoreconf, doxygen, tofrodos, libzen-dev (>= 0.4.39), libcurl4-gnutls-dev, libmms-dev, libglib2.0-dev, zlib1g-dev, pkg-config
 Package-List:
  libmediainfo-dev deb libdevel optional arch=any
  libmediainfo-doc deb doc optional arch=all
  libmediainfo0v5 deb libs optional arch=any
  python-mediainfodll deb python optional arch=all
  python3-mediainfodll deb python optional arch=all
 Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 libmediainfo_21.03.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libmediainfo_21.03-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_21.09.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_21.09-1deb9.debian.tar.xz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.03.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.03-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.09.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.09-1deb9.debian.tar.xz
 Files:
- 00000000000000000000000000000000 000000 libmediainfo_21.03.orig.tar.xz
- 00000000000000000000000000000000 000000 libmediainfo_21.03-1deb9.debian.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_21.09.orig.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_21.09-1deb9.debian.tar.xz
diff --git a/Project/Solaris/mkpkg b/Project/Solaris/mkpkg
@@ -9,7 +9,7 @@ release=`uname -r`
 
 #Creation of known directories and filenames
 name="libmediainfo0"
-version="21.03"
+version="21.09"
 Home=`pwd`
 install_prefix=${Home}/mk_package
 packagecreation_prefix=${Home}/create_package

diff --git a/Project/version.txt b/Project/version.txt
@@ -1 +1 @@
-21.03
+21.09
diff --git a/Source/Install/MediaInfo_DLL_Windows_i386.nsi b/Source/Install/MediaInfo_DLL_Windows_i386.nsi
@@ -4,7 +4,7 @@ RequestExecutionLevel admin
 ; Some defines
 !define PRODUCT_NAME "MediaInfo"
 !define PRODUCT_PUBLISHER "MediaArea.net"
-!define PRODUCT_VERSION "21.03"
+!define PRODUCT_VERSION "21.09"
 !define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0.0"
 !define PRODUCT_WEB_SITE "http://MediaArea.net/MediaInfo"
 !define COMPANY_REGISTRY "Software\MediaArea.net"

diff --git a/Source/Install/MediaInfo_DLL_Windows_x64.nsi b/Source/Install/MediaInfo_DLL_Windows_x64.nsi
@@ -4,7 +4,7 @@ RequestExecutionLevel admin
 ; Some defines
 !define PRODUCT_NAME "MediaInfo"
 !define PRODUCT_PUBLISHER "MediaArea.net"
-!define PRODUCT_VERSION "21.03"
+!define PRODUCT_VERSION "21.09"
 !define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0.0"
 !define PRODUCT_WEB_SITE "http://MediaArea.net/MediaInfo"
 !define COMPANY_REGISTRY "Software\MediaArea.net"

diff --git a/Source/MediaInfo/MediaInfo_Config.cpp b/Source/MediaInfo/MediaInfo_Config.cpp
@@ -136,7 +136,7 @@ namespace MediaInfoLib
 {
 
 //---------------------------------------------------------------------------
-const Char*  MediaInfo_Version=__T("MediaInfoLib - v21.03");
+const Char*  MediaInfo_Version=__T("MediaInfoLib - v21.09");
 const Char*  MediaInfo_Url=__T("http://MediaArea.net/MediaInfo");
       Ztring EmptyZtring;       //Use it when we can't return a reference to a true Ztring
 const Ztring EmptyZtring_Const; //Use it when we can't return a reference to a true Ztring, const version