Merge pull request #1238 from g-maxime/preparing-v20.03

Preparing v20.03
MediaArea · Apr 3, 2020 · 4d746dc · 4d746dc
2 parents 98799bb + fef4be3
commit 4d746dc
Show file tree

Hide file tree

Showing 23 changed files with 78 additions and 65 deletions.
diff --git a/History_DLL.txt b/History_DLL.txt
@@ -7,6 +7,19 @@ x Correction
 bug reports and feature request are here:
 https://sourceforge.net/p/mediainfo/_list/tickets
 
+Version 20.03, 2020-04-03
+-------------
++ AC-4 full featured support (presentations, groups, substreams)
++ MPEG-H 3D Audio basic support
++ MPEG-TS: audio preselection descriptor support
++ Dolby Vision v2 detection
++ MPEG-4: support of colr/nclx (color information) box
+x URL encoding option fixes, permitting to use URL encoded or non URL encoded links
+x AAC: fix SBR frequency when in ADIF
+x DPX: ColorimetricSpecification and TransferCharacteristic were inverted
+x Some API calls were not thread safe
+x Several crash and memory leaks fixes
+
 Version 19.09, 2019-09-10
 -------------
 + AC-4: basic detection, raw, in MP4 or TS

diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
@@ -4,8 +4,8 @@ cmake_minimum_required(VERSION 2.8.11)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
-set(MediaInfoLib_MAJOR_VERSION 19)
-set(MediaInfoLib_MINOR_VERSION 09)
+set(MediaInfoLib_MAJOR_VERSION 20)
+set(MediaInfoLib_MINOR_VERSION 03)
 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], [19.09])
+AC_INIT([libmediainfo], [20.03])
 
 dnl -------------------------------------------------------------------------
 dnl Test if we are at the good place

diff --git a/Project/GNU/PKGBUILD b/Project/GNU/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: hydro <[email protected]>
 
 pkgname=('libmediainfo' 'python2-mediainfo' 'python-mediainfo')
-pkgver=19.09
+pkgver=20.03
 pkgrel=1
 pkgdesc="shared library for mediainfo"
 arch=('i686' 'x86_64')

diff --git a/Project/GNU/libmediainfo.dsc b/Project/GNU/libmediainfo.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: libmediainfo
 Binary: libmediainfo-dev, libmediainfo0, python-mediainfodll, python3-mediainfodll, libmediainfo-doc libmediainfo0-dbg
 Architecture: any all
-Version: 19.09-1
+Version: 20.03-1
 Maintainer: MediaArea.net SARL <[email protected]>
 Homepage: http://MediaArea.net/MediaInfo
 Standards-Version: 3.9.6
@@ -16,11 +16,11 @@ Package-List:
  python-mediainfodll deb python optional arch=all
  python3-mediainfodll deb python optional arch=all
 Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 libmediainfo_19.09.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libmediainfo_19.09-1.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_20.03.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_20.03-1.debian.tar.xz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_19.09.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_19.09-1.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_20.03.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_20.03-1.debian.tar.xz
 Files:
- 00000000000000000000000000000000 000000 libmediainfo_19.09.orig.tar.xz
- 00000000000000000000000000000000 000000 libmediainfo_19.09-1.debian.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_20.03.orig.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_20.03-1.debian.tar.xz
diff --git a/Project/GNU/libmediainfo.spec b/Project/GNU/libmediainfo.spec
@@ -1,6 +1,6 @@
-%global libmediainfo_version      19.09
-%global libmediainfo_version_major      19
-%global libmediainfo_version_minor      09
+%global libmediainfo_version      20.03
+%global libmediainfo_version_major      20
+%global libmediainfo_version_minor      03
 %global libzen_version            0.4.37
 %global libzen_version_major      0
 %global libzen_version_minor      4
@@ -411,7 +411,7 @@ rm -f %{buildroot}%{_libdir}/%{name_without_0_ending}.la
 %endif
 
 %changelog
-* Sun Jan 01 2012 MediaArea.net SARL <[email protected]> - 19.09-0
+* Sun Jan 01 2012 MediaArea.net SARL <[email protected]> - 20.03-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 19,09,0,0
- PRODUCTVERSION 19,09,0,0
+ FILEVERSION 20,03,0,0
+ PRODUCTVERSION 20,03,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", "19.09.0.0"
+            VALUE "FileVersion", "20.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "19.09.0.0"
+            VALUE "ProductVersion", "20.03.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 19,09,0,0
- PRODUCTVERSION 19,09,0,0
+ FILEVERSION 20,03,0,0
+ PRODUCTVERSION 20,03,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", "19.09.0.0"
+            VALUE "FileVersion", "20.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "19.09.0.0"
+            VALUE "ProductVersion", "20.03.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 19,09,0,0
- PRODUCTVERSION 19,09,0,0
+ FILEVERSION 20,03,0,0
+ PRODUCTVERSION 20,03,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", "19.09.0.0"
+            VALUE "FileVersion", "20.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "19.09.0.0"
+            VALUE "ProductVersion", "20.03.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 19,09,0,0
- PRODUCTVERSION 19,09,0,0
+ FILEVERSION 20,03,0,0
+ PRODUCTVERSION 20,03,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", "19.09.0.0"
+            VALUE "FileVersion", "20.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "19.09.0.0"
+            VALUE "ProductVersion", "20.03.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 19,09,0,0
- PRODUCTVERSION 19,09,0,0
+ FILEVERSION 20,03,0,0
+ PRODUCTVERSION 20,03,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", "19.09.0.0"
+            VALUE "FileVersion", "20.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "19.09.0.0"
+            VALUE "ProductVersion", "20.03.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 19,09,0,0
- PRODUCTVERSION 19,09,0,0
+ FILEVERSION 20,03,0,0
+ PRODUCTVERSION 20,03,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", "19.09.0.0"
+            VALUE "FileVersion", "20.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "19.09.0.0"
+            VALUE "ProductVersion", "20.03.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 19,09,0,0
- PRODUCTVERSION 19,09,0,0
+ FILEVERSION 20,03,0,0
+ PRODUCTVERSION 20,03,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", "19.09.0.0"
+            VALUE "FileVersion", "20.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "19.09.0.0"
+            VALUE "ProductVersion", "20.03.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", "19.09.0.0"
+            VALUE "FileVersion", "20.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "19.09.0.0"
+            VALUE "ProductVersion", "20.03.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 (19.09-1) experimental; urgency=medium
+libmediainfo (20.03-1) experimental; urgency=medium
 
-  * Upstream version 19.09
+  * Upstream version 20.03
     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.dsc b/Project/OBS/deb9.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: libmediainfo
 Binary: libmediainfo-dev, libmediainfo0v5, python-mediainfodll, python3-mediainfodll, libmediainfo-doc libmediainfo0v5-dbg
 Architecture: any all
-Version: 19.09-1deb9
+Version: 20.03-1deb9
 Maintainer: MediaArea.net SARL <[email protected]>
 Homepage: http://MediaArea.net/MediaInfo
 Standards-Version: 3.9.6
@@ -16,11 +16,11 @@ Package-List:
  python-mediainfodll deb python optional arch=all
  python3-mediainfodll deb python optional arch=all
 Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 libmediainfo_19.09.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libmediainfo_19.09-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_20.03.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_20.03-1deb9.debian.tar.xz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_19.09.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_19.09-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_20.03.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_20.03-1deb9.debian.tar.xz
 Files:
- 00000000000000000000000000000000 000000 libmediainfo_19.09.orig.tar.xz
- 00000000000000000000000000000000 000000 libmediainfo_19.09-1deb9.debian.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_20.03.orig.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_20.03-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="19.09"
+version="20.03"
 Home=`pwd`
 install_prefix=${Home}/mk_package
 packagecreation_prefix=${Home}/create_package

diff --git a/Project/version.txt b/Project/version.txt
@@ -1 +1 @@
-19.09
+20.03
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 "19.09"
+!define PRODUCT_VERSION "20.03"
 !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 "19.09"
+!define PRODUCT_VERSION "20.03"
 !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
@@ -133,7 +133,7 @@ namespace MediaInfoLib
 {
 
 //---------------------------------------------------------------------------
-const Char*  MediaInfo_Version=__T("MediaInfoLib - v19.09");
+const Char*  MediaInfo_Version=__T("MediaInfoLib - v20.03");
 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

diff --git a/Source/MediaInfoDLL/MediaInfoDLL.rc b/Source/MediaInfoDLL/MediaInfoDLL.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 19,09,0,0
- PRODUCTVERSION 19,09,0,0
+ FILEVERSION 20,03,0,0
+ PRODUCTVERSION 20,03,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", "19.09.0.0"
+            VALUE "FileVersion", "20.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "19.09.0.0"
+            VALUE "ProductVersion", "20.03.0.0"
         END
     END
     BLOCK "VarFileInfo"

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