* https://github.com/MediaArea/MediaInfoLib/pull/1171/files

pavel-pimenov · Sep 14, 2019 · 089c61d · 089c61d
1 parent 8ca4e1c
commit 089c61d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/FlyFeatures/flyServer.h b/FlyFeatures/flyServer.h
@@ -619,17 +619,17 @@ class CFlyServerJSON
 class CFlyServerAdapter
 {
 };
-		class  CFlyServerJSON
-		{
+class CFlyServerJSON
+{
 public:
-				static bool pushError(unsigned p_error_code, string p_error, bool p_is_include_disk_info = true)
-				{
-					return false;
-				}
-				static void pushSyslogError(const string& p_error)
-				{
-				}
-		};
+    static bool pushError(unsigned p_error_code, string p_error, bool p_is_include_disk_info = true)
+    {
+        return false;
+    }
+    static void pushSyslogError(const string& p_error)
+    {
+    }
+};
 #endif // FLYLINKDC_USE_MEDIAINFO_SERVER
 
 #endif // _FLY_SERVER_H
diff --git a/MediaInfoLib/Source/MediaInfo/Multiple/File_MpegTs.cpp b/MediaInfoLib/Source/MediaInfo/Multiple/File_MpegTs.cpp
@@ -1364,7 +1364,7 @@ void File_MpegTs::Streams_Finish()
         File__Duplicate_Streams_Finish();
     #endif //MEDIAINFO_DUPLICATE
 
-    #if MEDIAINFO_IBICREATE
+    #if MEDIAINFO_IBIUSAGE
         if (!IsSub && Config_Ibi_Create)
         {
             for (ibi::streams::iterator IbiStream_Temp=Ibi.Streams.begin(); IbiStream_Temp!=Ibi.Streams.end(); ++IbiStream_Temp)

diff --git a/MediaInfoLib/Source/MediaInfo/Multiple/File_Mxf.cpp b/MediaInfoLib/Source/MediaInfo/Multiple/File_Mxf.cpp
@@ -17467,6 +17467,8 @@ void File_Mxf::Subsampling_Compute(descriptors::iterator Descriptor)
 //---------------------------------------------------------------------------
 void File_Mxf::ColorLevels_Compute(descriptors::iterator Descriptor, bool Force, int32u BitDepth)
 {
+    if (Descriptor == Descriptors.end())
+        return;
     // BitDepth check
     std::map<std::string, Ztring>::iterator Info=Descriptor->second.Infos.find("BitDepth");
     if (Info!=Descriptor->second.Infos.end())

diff --git a/build_all_2017.bat b/build_all_2017.bat
@@ -1,6 +1,6 @@
 echo on
 call clean_all_2017.bat
-call update_geo_ip.bat
+rem call update_geo_ip.bat
 call build_flylinkdc_2017.bat
 call build_flylinkdc_x64_2017.bat
 

diff --git a/clean_all_2017.bat b/clean_all_2017.bat
@@ -14,6 +14,8 @@ rmdir /S /Q .\compiled\Settings\HubLists
 del /S /F /Q mrgtmp0
 del /S /F /Q *.tmp
 del /S /F /Q *.obj
+del /S /F /Q *.ipch
+del /S /F /Q *.iobj
 del /S /F /Q *.lib
 del /S /F /Q *.tlog
 del /S /F /Q *.cpp.orig

diff --git a/compiled/readme_changelog_lite.rtf b/compiled/readme_changelog_lite.rtf
@@ -7,7 +7,11 @@
 \'d2\'e0\'ea\'e6\'e5 \'e0\'ed\'ee\'ed\'e8\'ec\'ed\'ee \'ec\'ee\'e6\'ed\'ee \'e2\'fb\'f1\'ea\'e0\'e7\'fb\'e2\'e0\'f2\'fc \'e7\'e0\'ec\'e5\'f7\'e0\'ed\'e8\'ff \'ee \'ef\'f0\'ee\'e3\'f0\'e0\'ec\'ec\'e5 \'ed\'e0 \'f5\'e0\'e1\'e5 \'ef\'ee\'e4\'e4\'e5\'e6\'ea\'e8\par
 dchub://dc.fly-server.ru\par
 \par
-\pard\nowidctlpar\kerning2\b ================ \cf3 505\cf0 -beta-21\lang1033\f1 920\lang1049\f0  ====================\par
+\pard\nowidctlpar\kerning2\b ================ \cf3 505\cf0 -beta-21\lang1033\f1 944\lang1049\f0  ====================\par
+\b0\fs16 * OpenSSL 1.0.2s\par
+* mediainfo\par
+* boost 1.71\par
+\b\fs18 ================ \cf3 505\cf0 -beta-21\lang1033\f1 920\lang1049\f0  ====================\par
 \b0\fs16 * \'c8\'f1\'ef\'f0\'e0\'e2\'eb\'e5\'ed\'ee \'f1\'ee\'f5\'f0\'e0\'ed\'e5\'ed\'e8\'e5 \'ef\'ee\'e7\'e8\'f6\'e8\'e8 \'ee\'ea\'ed\'e0 \'e5\'f1\'eb\'e8 2 \'ec\'ee\'ed\'e8\'f2\'ee\'f0\'e0 4K\par
 ........\par
 * mediainfolib 19.07, 2019-07-16\par

diff --git a/revision.h b/revision.h
@@ -2,7 +2,7 @@
 #define FLY_REVISION_H
 
 #define VERSION_NUM 504
-#define REVISION_NUM 21920
+#define REVISION_NUM 21961
 //#define FLYLINKDC_BETA
 #define BETA_NUM    // Number of beta. Does not matter if the #define FLYLINKDC_BETA is disabled.