Merge branch 'feat/java-mpeg-demux'
# Conflicts: # app/src/main/java/ru/vtosters/lite/music/downloader/M3UDownloader.java # smali/res/xml/preferences_media.xml
This commit is contained in:
@@ -248,7 +248,6 @@ public final class MediaNative {
|
||||
if (isMediaLoaded) {
|
||||
return;
|
||||
}
|
||||
NativeLibLoader.loadLibrary("ffmpeg");
|
||||
isMediaLoaded = NativeLibLoader.loadLibrary("vkmedia");
|
||||
isMediaLoaded = NativeLibLoader.loadLibrary("vkmediaencoder");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user