Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-Android
Commits
63e40d15
Commit
63e40d15
authored
Jun 10, 2016
by
Geoffrey Métais
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Group lib compat load in global try/catch
parent
e3b0919d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
libvlc/src/org/videolan/libvlc/LibVLC.java
libvlc/src/org/videolan/libvlc/LibVLC.java
+3
-4
No files found.
libvlc/src/org/videolan/libvlc/LibVLC.java
View file @
63e40d15
...
...
@@ -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
)
{
...
...
Geoffrey Métais
@Dekans
mentioned in commit
0ae99fbd
·
Jun 14, 2016
mentioned in commit
0ae99fbd
mentioned in commit 0ae99fbdf4355bd4e52af9a92825400087c54c1c
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment