Merge pull request #1524 from g-maxime/preparing-v22.03v22.03

Preparing v22.03

23 files changed, 100 insertions, 65 deletions

diff --git a/History_DLL.txt b/History_DLL.txt
index 4d68a056a..a26217290 100644
--- a/History_DLL.txt
+++ b/History_DLL.txt
@@ -7,6 +7,41 @@ x Correction
 bug reports and feature request are here:

 https://sourceforge.net/p/mediainfo/_list/tickets

 

+Version 22.03, 2022-03-31
+-------------
++ NSV (Nullsoft Video): full featured support
++ NSV: support of proprietary StarDiva metadata (by reverse engineering)
++ HEVC: CEA-608/708 support
++ Dolby Audio Metadata: First frame of action, binaural render modes
++ Dolby Audio Metadata: 5.1 and 5.1.x downmix, 5.1 to 2.0 downmix, associated video frame rate, trim modes
++ MOV/MP4, TTML, SCC, MXF TC: time code of last frame
++ EIA-608: first displayed caption type
++ EIA-608: Maximum count of lines per event and total count of lines
++ EIA-608: duration of the visible content
++ TTML: Total count of lines
++ TTML: Maximum count of lines per event (including overlapping times)
++ TTML: Frame count, display aspect ratio
++ TTML: Support of timestamps in frames
++ SCC: Delay
++ Matroska: Encoding settings metadata support
++ MOV/MP4: Gamma metadata output
++ MPEG-4/MOV: difference between audio Center and Mono when possible
++ MP4/MOV: Support of dec3 atom in wave atom
++ MPEG-4/MOV: show both values in case of chan atom ChannelLayoutTag / ChannelDescriptions mismatch
++ MP4/MOV: Support of dec3 atom in wave atom
++ MXF: better support of AVC streams without SPS/PPS
++ ADM: display channel index of trackUIDs
+x WAV: fix freeze with 32-bit PCM
+x DPX: fix regression with DPX files more than 64 MB
+x Dolby E: fix crash with some invalid streams
+x E-AC-3: service kind was not correctly handled
+x EXR: fix of bad handling of files with long names in attributes
+x TTML: correct handling of 29.97 DF time codes
+x AV1: fix of the parsing of some streams, especially the ones with HDR metadata
+x WebVTT: was not correctly handling WebVTT header with comment
+x Matroska: fix false positive detection of bad CRC32
+x Several other parsing bug/crash fixes
+
 Version 21.09, 2021-09-17
 -------------
 + Graph view for 3D audio streams (thanks to graphviz)
diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
index dbb86ff36..5c49030d6 100644
--- a/Project/CMake/CMakeLists.txt
+++ b/Project/CMake/CMakeLists.txt
@@ -4,8 +4,8 @@ project(MediaInfoLib)
 

 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")

 

-set(MediaInfoLib_MAJOR_VERSION 21)

-set(MediaInfoLib_MINOR_VERSION 09)

+set(MediaInfoLib_MAJOR_VERSION 22)

+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
index 1bfc8c241..a8be4edfe 100644
--- 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.09])
+AC_INIT([libmediainfo], [22.03])
 
 dnl -------------------------------------------------------------------------
 dnl Test if we are at the good place
diff --git a/Project/GNU/PKGBUILD b/Project/GNU/PKGBUILD
index e545c50be..f7ed7ea67 100644
--- a/Project/GNU/PKGBUILD
+++ b/Project/GNU/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: hydro <hydro@freenet.de>
 
 pkgname=('libmediainfo' 'python2-mediainfo' 'python-mediainfo')
-pkgver=21.09
+pkgver=22.03
 pkgrel=1
 pkgdesc="shared library for mediainfo"
 arch=('i686' 'x86_64')
diff --git a/Project/GNU/libmediainfo.dsc b/Project/GNU/libmediainfo.dsc
index 7838ab69d..b7d760f6a 100644
--- 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: 21.09-1
+Version: 22.03-1
 Maintainer: MediaArea.net SARL <info@mediaarea.net>
 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_21.09.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libmediainfo_21.09-1.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_22.03-1.debian.tar.xz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.09.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.09-1.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.03-1.debian.tar.xz
 Files:
- 00000000000000000000000000000000 000000 libmediainfo_21.09.orig.tar.xz
- 00000000000000000000000000000000 000000 libmediainfo_21.09-1.debian.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_22.03-1.debian.tar.xz
diff --git a/Project/GNU/libmediainfo.spec b/Project/GNU/libmediainfo.spec
index be765cf5c..e455c30a2 100644
--- a/Project/GNU/libmediainfo.spec
+++ b/Project/GNU/libmediainfo.spec
@@ -1,6 +1,6 @@
-%global libmediainfo_version      21.09
-%global libmediainfo_version_major      21
-%global libmediainfo_version_minor      09
+%global libmediainfo_version      22.03
+%global libmediainfo_version_major      22
+%global libmediainfo_version_minor      03
 %global libzen_version            0.4.39
 %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 <info@mediaarea.net> - 21.09-0
+* Sun Jan 01 2012 MediaArea.net SARL <info@mediaarea.net> - 22.03-0
 - See History.txt for more info and real dates
 - Previous packages made by Toni Graffy <toni@links2linux.de>
 - Fedora style made by Vasiliy N. Glazov <vascom2@gmail.com>
diff --git a/Project/MSVC2013/Example/HowToUse.rc b/Project/MSVC2013/Example/HowToUse.rc
index 018f94d68..5d093f133 100644
--- 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,09,0,0

- PRODUCTVERSION 21,09,0,0

+ FILEVERSION 22,03,0,0

+ PRODUCTVERSION 22,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", "21.09.0.0"

+            VALUE "FileVersion", "22.03.0.0"

             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"

             VALUE "ProductName", "MediaInfo"

-            VALUE "ProductVersion", "21.09.0.0"

+            VALUE "ProductVersion", "22.03.0.0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc
index 018f94d68..5d093f133 100644
--- 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,09,0,0

- PRODUCTVERSION 21,09,0,0

+ FILEVERSION 22,03,0,0

+ PRODUCTVERSION 22,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", "21.09.0.0"

+            VALUE "FileVersion", "22.03.0.0"

             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"

             VALUE "ProductName", "MediaInfo"

-            VALUE "ProductVersion", "21.09.0.0"

+            VALUE "ProductVersion", "22.03.0.0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2015/Example/HowToUse.rc b/Project/MSVC2015/Example/HowToUse.rc
index 4f02d6e12..b35e3598c 100644
--- 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,09,0,0
- PRODUCTVERSION 21,09,0,0
+ FILEVERSION 22,03,0,0
+ PRODUCTVERSION 22,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", "21.09.0.0"
+            VALUE "FileVersion", "22.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.09.0.0"
+            VALUE "ProductVersion", "22.03.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc
index 4f02d6e12..b35e3598c 100644
--- 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,09,0,0
- PRODUCTVERSION 21,09,0,0
+ FILEVERSION 22,03,0,0
+ PRODUCTVERSION 22,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", "21.09.0.0"
+            VALUE "FileVersion", "22.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.09.0.0"
+            VALUE "ProductVersion", "22.03.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Project/MSVC2017/Example/HowToUse.rc b/Project/MSVC2017/Example/HowToUse.rc
index 4f02d6e12..b35e3598c 100644
--- 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,09,0,0
- PRODUCTVERSION 21,09,0,0
+ FILEVERSION 22,03,0,0
+ PRODUCTVERSION 22,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", "21.09.0.0"
+            VALUE "FileVersion", "22.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.09.0.0"
+            VALUE "ProductVersion", "22.03.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc
index 4f02d6e12..b35e3598c 100644
--- 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,09,0,0
- PRODUCTVERSION 21,09,0,0
+ FILEVERSION 22,03,0,0
+ PRODUCTVERSION 22,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", "21.09.0.0"
+            VALUE "FileVersion", "22.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.09.0.0"
+            VALUE "ProductVersion", "22.03.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Project/MSVC2019/Example/HowToUse.rc b/Project/MSVC2019/Example/HowToUse.rc
index 4f02d6e12..b35e3598c 100644
--- 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,09,0,0
- PRODUCTVERSION 21,09,0,0
+ FILEVERSION 22,03,0,0
+ PRODUCTVERSION 22,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", "21.09.0.0"
+            VALUE "FileVersion", "22.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.09.0.0"
+            VALUE "ProductVersion", "22.03.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Project/MSVC2019/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2019/ShellExtension/MediaInfoShellExt.rc
index a7e8ee09c..dcff4215f 100644
--- 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.09.0.0"
+            VALUE "FileVersion", "22.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.09.0.0"
+            VALUE "ProductVersion", "22.03.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Project/OBS/deb9.debian/changelog b/Project/OBS/deb9.debian/changelog
index cec8c8315..a2c0d75ec 100644
--- a/Project/OBS/deb9.debian/changelog
+++ b/Project/OBS/deb9.debian/changelog
@@ -1,6 +1,6 @@
-libmediainfo (21.09-1) experimental; urgency=medium
+libmediainfo (22.03-1) experimental; urgency=medium
 
-  * Upstream version 21.09
+  * Upstream version 22.03
     For details, see https://github.com/MediaArea/MediaInfoLib/blob/master/History_DLL.txt
 
  -- MediaArea <info@mediaarea.net>  Mon, 02 Nov 2015 10:30:00 +0100
diff --git a/Project/OBS/deb9.dsc b/Project/OBS/deb9.dsc
index ae0049a19..ac72b7d11 100644
--- 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: 21.09-1deb9
+Version: 22.03-1deb9
 Maintainer: MediaArea.net SARL <info@mediaarea.net>
 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_21.09.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libmediainfo_21.09-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_22.03-1deb9.debian.tar.xz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.09.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_21.09-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_22.03-1deb9.debian.tar.xz
 Files:
- 00000000000000000000000000000000 000000 libmediainfo_21.09.orig.tar.xz
- 00000000000000000000000000000000 000000 libmediainfo_21.09-1deb9.debian.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_22.03.orig.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_22.03-1deb9.debian.tar.xz
diff --git a/Project/Solaris/mkpkg b/Project/Solaris/mkpkg
index 9649a57bc..0f0feb37c 100755
--- 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.09"
+version="22.03"
 Home=`pwd`
 install_prefix=${Home}/mk_package
 packagecreation_prefix=${Home}/create_package
diff --git a/Project/version.txt b/Project/version.txt
index 2b54dccd7..caa99e3a9 100644
--- a/Project/version.txt
+++ b/Project/version.txt
@@ -1 +1 @@
-21.09
+22.03
diff --git a/Source/Install/MediaInfo_DLL_Windows_i386.nsi b/Source/Install/MediaInfo_DLL_Windows_i386.nsi
index edbbd3d2a..a5dab7c93 100644
--- 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.09"

+!define PRODUCT_VERSION "22.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
index a21117f17..e02215ac1 100644
--- 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.09"

+!define PRODUCT_VERSION "22.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
index 437ba1036..0866a45d1 100644
--- 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.09");

+const Char*  MediaInfo_Version=__T("MediaInfoLib - v22.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
index 4f02d6e12..b35e3598c 100644
--- a/Source/MediaInfoDLL/MediaInfoDLL.rc
+++ b/Source/MediaInfoDLL/MediaInfoDLL.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,09,0,0
- PRODUCTVERSION 21,09,0,0
+ FILEVERSION 22,03,0,0
+ PRODUCTVERSION 22,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", "21.09.0.0"
+            VALUE "FileVersion", "22.03.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2020 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "21.09.0.0"
+            VALUE "ProductVersion", "22.03.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/debian/changelog b/debian/changelog
index 7f2543f50..46b41fe24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-libmediainfo (21.09-1) experimental; urgency=medium
+libmediainfo (22.03-1) experimental; urgency=medium
 
-  * Upstream version 21.09
+  * Upstream version 22.03
     For details, see https://github.com/MediaArea/MediaInfoLib/blob/master/History_DLL.txt
 
  -- MediaArea <info@mediaarea.net>  Mon, 02 Nov 2015 10:30:00 +0100