diff --git a/build.xml b/build.xml index 826b4795..621fc35a 100644 --- a/build.xml +++ b/build.xml @@ -624,12 +624,11 @@ - - + diff --git a/installer/msi/filebot-wix.xml b/installer/msi/filebot-wix.xml index 78a5f0d7..f4d543e7 100644 --- a/installer/msi/filebot-wix.xml +++ b/installer/msi/filebot-wix.xml @@ -61,7 +61,6 @@ - diff --git a/lib/native/linux-amd64/libmediainfo.so b/lib/native/linux-amd64/libmediainfo.so index 041bcb46..030dd83f 100644 Binary files a/lib/native/linux-amd64/libmediainfo.so and b/lib/native/linux-amd64/libmediainfo.so differ diff --git a/lib/native/linux-amd64/libzen.so b/lib/native/linux-amd64/libzen.so index 05a71bf8..cf869ad0 100644 Binary files a/lib/native/linux-amd64/libzen.so and b/lib/native/linux-amd64/libzen.so differ diff --git a/lib/native/linux-i686/libmediainfo.so b/lib/native/linux-i686/libmediainfo.so index 3ca6f535..2e8062a2 100644 Binary files a/lib/native/linux-i686/libmediainfo.so and b/lib/native/linux-i686/libmediainfo.so differ diff --git a/lib/native/linux-i686/libzen.so b/lib/native/linux-i686/libzen.so index 7e821439..88968db2 100644 Binary files a/lib/native/linux-i686/libzen.so and b/lib/native/linux-i686/libzen.so differ diff --git a/lib/native/mac-x86_64/libmediainfo.dylib b/lib/native/mac-x86_64/libmediainfo.dylib index b74cbfd5..c2002b6c 100755 Binary files a/lib/native/mac-x86_64/libmediainfo.dylib and b/lib/native/mac-x86_64/libmediainfo.dylib differ diff --git a/lib/native/win32-x64/MediaInfo.dll b/lib/native/win32-x64/MediaInfo.dll index 8b48612b..ef621f34 100644 Binary files a/lib/native/win32-x64/MediaInfo.dll and b/lib/native/win32-x64/MediaInfo.dll differ diff --git a/lib/native/win32-x64/gcc_s_seh-1.dll b/lib/native/win32-x64/gcc_s_seh-1.dll deleted file mode 100644 index 1f290253..00000000 Binary files a/lib/native/win32-x64/gcc_s_seh-1.dll and /dev/null differ diff --git a/lib/native/win32-x86/MediaInfo.dll b/lib/native/win32-x86/MediaInfo.dll index 7333b353..4fdf6787 100644 Binary files a/lib/native/win32-x86/MediaInfo.dll and b/lib/native/win32-x86/MediaInfo.dll differ diff --git a/lib/native/win32-x86/gcc_s_seh-1.dll b/lib/native/win32-x86/gcc_s_seh-1.dll deleted file mode 100644 index e69de29b..00000000 diff --git a/source/net/filebot/archive/SevenZipLoader.java b/source/net/filebot/archive/SevenZipLoader.java index cb9943a5..d06efdd6 100644 --- a/source/net/filebot/archive/SevenZipLoader.java +++ b/source/net/filebot/archive/SevenZipLoader.java @@ -1,6 +1,5 @@ package net.filebot.archive; -import static net.filebot.Logging.*; import net.sf.sevenzipjbinding.IArchiveOpenCallback; import net.sf.sevenzipjbinding.IInArchive; import net.sf.sevenzipjbinding.IInStream; @@ -8,8 +7,6 @@ import net.sf.sevenzipjbinding.SevenZip; import net.sf.sevenzipjbinding.SevenZipException; import net.sf.sevenzipjbinding.SevenZipNativeInitializationException; -import com.sun.jna.Platform; - public class SevenZipLoader { private static boolean nativeLibrariesLoaded = false; @@ -21,14 +18,6 @@ public class SevenZipLoader { // initialize 7z-JBinding native libs try { - try { - if (Platform.isWindows() && Platform.is64Bit()) { - System.loadLibrary("gcc_s_seh-1"); - } - } catch (Throwable e) { - debug.warning("Failed to preload library: " + e); - } - System.loadLibrary("7-Zip-JBinding"); SevenZip.initLoadedLibraries(); // NATIVE LIBS MUST BE LOADED WITH SYSTEM CLASSLOADER nativeLibrariesLoaded = true;