Commit 0ae99fbd authored by Geoffrey Métais's avatar Geoffrey Métais

Group lib compat load in global try/catch

(cherry picked from commit 63e40d15)
parent d89cceb0
......@@ -20,14 +20,13 @@
package org.videolan.libvlc;
import java.util.ArrayList;
import android.os.Build;
import android.util.Log;
import android.view.Surface;
import org.videolan.libvlc.util.HWDecoderUtil;
import java.util.ArrayList;
@SuppressWarnings("unused, JniMissingFunction")
public class LibVLC extends VLCObject<LibVLC.Event> {
private static final String TAG = "VLC/LibVLC";
......@@ -153,7 +152,6 @@ public class LibVLC extends VLCObject<LibVLC.Event> {
return;
sLoaded = true;
System.loadLibrary("compat.7");
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD_MR1) {
try {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.HONEYCOMB_MR1)
......@@ -189,6 +187,7 @@ public class LibVLC extends VLCObject<LibVLC.Event> {
}
try {
System.loadLibrary("compat.7");
System.loadLibrary("vlc");
System.loadLibrary("vlcjni");
} catch (UnsatisfiedLinkError ule) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment