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:
aliveoutside
2024-03-11 10:10:37 +03:00
31 changed files with 254 additions and 1415 deletions
@@ -248,7 +248,6 @@ public final class MediaNative {
if (isMediaLoaded) {
return;
}
NativeLibLoader.loadLibrary("ffmpeg");
isMediaLoaded = NativeLibLoader.loadLibrary("vkmedia");
isMediaLoaded = NativeLibLoader.loadLibrary("vkmediaencoder");
}