From 8b5ccfcd7ac3f13a3cd323afbff984b15a72118b Mon Sep 17 00:00:00 2001
From: Vasiliy Glazov <vascom2@gmail.com>
Date: Apr 24 2019 06:14:10 +0000
Subject: Update to 19.04.


---

diff --git a/.gitignore b/.gitignore
index 6874c13..e747f9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
 /libmediainfo_18.08.tar.xz
 /libmediainfo_18.08.1.tar.xz
 /libmediainfo_18.12.tar.xz
+/libmediainfo_19.04.tar.xz
diff --git a/1111.patch b/1111.patch
deleted file mode 100644
index 855cd9d..0000000
--- a/1111.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 716747fdde2c8dd6d0fca1223362ae5ce533ae38 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Martinez?= <jerome@mediaarea.net>
-Date: Thu, 11 Apr 2019 12:39:13 +0200
-Subject: [PATCH 1/2] x B1101, AVI: fix crash with some invalid streams
-
----
- Source/MediaInfo/Multiple/File_Riff.cpp          | 2 +-
- Source/MediaInfo/Multiple/File_Riff_Elements.cpp | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Source/MediaInfo/Multiple/File_Riff.cpp b/Source/MediaInfo/Multiple/File_Riff.cpp
-index e54123520..626c2d3b5 100644
---- a/Source/MediaInfo/Multiple/File_Riff.cpp
-+++ b/Source/MediaInfo/Multiple/File_Riff.cpp
-@@ -938,7 +938,7 @@ void File_Riff::Header_Parse()
-     }
- 
-     //Alignment
--    if (Size_Complete%2 && !IsNotWordAligned)
-+    if (Size_Complete%2 && !IsNotWordAligned && File_Offset+Buffer_Offset+Element_Offset+Size_Complete<File_Size)
-     {
-         Size_Complete++; //Always 2-byte aligned
-         Alignement_ExtraByte=1;
-diff --git a/Source/MediaInfo/Multiple/File_Riff_Elements.cpp b/Source/MediaInfo/Multiple/File_Riff_Elements.cpp
-index 2622dfc16..5cea75be1 100644
---- a/Source/MediaInfo/Multiple/File_Riff_Elements.cpp
-+++ b/Source/MediaInfo/Multiple/File_Riff_Elements.cpp
-@@ -450,7 +450,8 @@ namespace Elements
- void File_Riff::Data_Parse()
- {
-     //Alignement specific
--    Element_Size-=Alignement_ExtraByte;
-+    if (Alignement_ExtraByte<=Element_Size)
-+        Element_Size-=Alignement_ExtraByte;
- 
-     DATA_BEGIN
-     LIST(AIFC)
-
-From 65a7c4b24025b8fba0ead719c21ac562206d4ebf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Martinez?= <jerome@mediaarea.net>
-Date: Thu, 11 Apr 2019 12:39:29 +0200
-Subject: [PATCH 2/2] x B1101, SMPTE ST 337: fix crash with some invalid
- streams
-
----
- Source/MediaInfo/Audio/File_SmpteSt0337.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/Source/MediaInfo/Audio/File_SmpteSt0337.cpp b/Source/MediaInfo/Audio/File_SmpteSt0337.cpp
-index 7fa87b4cc..03775dcb7 100644
---- a/Source/MediaInfo/Audio/File_SmpteSt0337.cpp
-+++ b/Source/MediaInfo/Audio/File_SmpteSt0337.cpp
-@@ -1158,6 +1158,7 @@ void File_SmpteSt0337::Data_Parse()
- 
-     // Parsing
-     int32u  length_code;
-+    int8u data_type_New;
-     Element_Begin1("Header");
-         BS_Begin();
-         Skip_S3(Stream_Bits,                                    "Pa");
-@@ -1167,7 +1168,7 @@ void File_SmpteSt0337::Data_Parse()
-             Skip_S1( 5,                                         "data_type_dependent");
-             Skip_SB(                                            "error_flag");
-             Info_S1( 2, data_mode,                              "data_mode"); Param_Info2(16+4*data_mode, " bits");
--            Get_S1 ( 5, data_type,                              "data_type"); Param_Info1(Smpte_St0337_data_type[data_type]);
-+            Get_S1 ( 5, data_type_New,                          "data_type"); Param_Info1(Smpte_St0337_data_type[data_type]);
-             if (Stream_Bits>16)
-                 Skip_S1( 4,                                     "reserved");
-             if (Stream_Bits>20)
-@@ -1177,6 +1178,11 @@ void File_SmpteSt0337::Data_Parse()
-         BS_End();
-     Element_End0();
- 
-+    if (data_type_New!=data_type)
-+    {
-+        delete Parser; Parser=NULL;
-+        data_type=data_type_New;
-+    }
-     if (Parser==NULL)
-     {
-         switch(data_type)
diff --git a/libmediainfo.spec b/libmediainfo.spec
index e70cf65..ebee268 100644
--- a/libmediainfo.spec
+++ b/libmediainfo.spec
@@ -1,15 +1,14 @@
 %global libzen_version  0.4.37
 
 Name:           libmediainfo
-Version:        18.12
-Release:        3%{?dist}
+Version:        19.04
+Release:        1%{?dist}
 Summary:        Library for supplies technical and tag information about a video or audio file
 Summary(ru):    Библиотека для предоставления полной информации о видео или аудио файле
 
 License:        BSD
 URL:            http://mediaarea.net/MediaInfo
 Source0:        http://mediaarea.net/download/source/%{name}/%{version}/%{name}_%{version}.tar.xz
-Patch0:         1111.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -83,7 +82,7 @@ Include files and mandatory libraries for development.
 Файлы для разработки %{name}.
 
 %prep
-%autosetup -p1 -n MediaInfoLib
+%autosetup -n MediaInfoLib
 
 cp           Release/ReadMe_DLL_Linux.txt ReadMe.txt
 mv           History_DLL.txt History.txt
@@ -135,6 +134,9 @@ rm -f %{buildroot}%{_libdir}/%{name}.la
 %{_libdir}/cmake/mediainfolib/
 
 %changelog
+* Wed Apr 24 2019 Vasiliy N. Glazov <vascom2@gmail.com> - 19.04-1
+- Update to 19.04
+
 * Mon Apr 22 2019 Vasiliy N. Glazov <vascom2@gmail.com> - 18.12-3
 - Fix CVE-2019-11372
 
diff --git a/sources b/sources
index 9acaf44..b58a864 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libmediainfo_18.12.tar.xz) = 88a5617404afbea99dfe5f96371711c8066f3a78353937e95fdfe72d3ab29943e68f0ecc21b5771f5f1cde2717af9002c61c388c3fd0e2ddcdc4ef77320348eb
+SHA512 (libmediainfo_19.04.tar.xz) = 7fdacc206f1db57605fc41b717740e6c6ce245d432faef15abb48e646bc05743ce72ee117519464d0341d83e0b306ddab79c9d34fd348897d4b0d15cb2f7db04