Merge branch 'master' into root

Conflicts: AndroidManifest.xml libs/limelight-common.jar res/values/strings.xml
2026-04-19 15:00:22 +00:00 · 2014-10-17 13:55:45 -07:00
parent 8efe194682 b492ac43f8
commit a18aa51f5a
92 changed files with 417 additions and 273 deletions
--- a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavcodec-55.so
+++ b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavcodec-55.so
--- a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavformat-55.so
+++ b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavformat-55.so
--- a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavutil-52.so
+++ b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libavutil-52.so
--- a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswresample-0.so
+++ b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswresample-0.so
--- a/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswscale-2.so
+++ b/jni/nv_avc_dec/ffmpeg/arm64-v8a/lib/libswscale-2.so
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavcodec-55.so
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavcodec-55.so
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavformat-55.so
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavformat-55.so
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavutil-52.so
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavutil-52.so
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswresample-0.so
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswresample-0.so
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswscale-2.so
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswscale-2.so
--- a/jni/nv_avc_dec/ffmpeg/build_android.sh
+++ b/jni/nv_avc_dec/ffmpeg/build_android.sh
@@ -1,4 +1,4 @@
-ANDROID_API_TARGET=L
+ANDROID_API_TARGET=21
 PARALLEL_JOBS=$(nproc)

 rm -r ./android
--- a/jni/nv_avc_dec/ffmpeg/mips/lib/libavcodec-55.so
+++ b/jni/nv_avc_dec/ffmpeg/mips/lib/libavcodec-55.so
--- a/jni/nv_avc_dec/ffmpeg/mips/lib/libavformat-55.so
+++ b/jni/nv_avc_dec/ffmpeg/mips/lib/libavformat-55.so
--- a/jni/nv_avc_dec/ffmpeg/mips/lib/libavutil-52.so
+++ b/jni/nv_avc_dec/ffmpeg/mips/lib/libavutil-52.so
--- a/jni/nv_avc_dec/ffmpeg/mips/lib/libswresample-0.so
+++ b/jni/nv_avc_dec/ffmpeg/mips/lib/libswresample-0.so
--- a/jni/nv_avc_dec/ffmpeg/mips/lib/libswscale-2.so
+++ b/jni/nv_avc_dec/ffmpeg/mips/lib/libswscale-2.so
--- a/jni/nv_avc_dec/ffmpeg/x86/lib/libavcodec-55.so
+++ b/jni/nv_avc_dec/ffmpeg/x86/lib/libavcodec-55.so
--- a/jni/nv_avc_dec/ffmpeg/x86/lib/libavformat-55.so
+++ b/jni/nv_avc_dec/ffmpeg/x86/lib/libavformat-55.so
--- a/jni/nv_avc_dec/ffmpeg/x86/lib/libavutil-52.so
+++ b/jni/nv_avc_dec/ffmpeg/x86/lib/libavutil-52.so
--- a/jni/nv_avc_dec/ffmpeg/x86/lib/libswresample-0.so
+++ b/jni/nv_avc_dec/ffmpeg/x86/lib/libswresample-0.so
--- a/jni/nv_avc_dec/ffmpeg/x86/lib/libswscale-2.so
+++ b/jni/nv_avc_dec/ffmpeg/x86/lib/libswscale-2.so
--- a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavcodec-55.so
+++ b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavcodec-55.so
--- a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavformat-55.so
+++ b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavformat-55.so
--- a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavutil-52.so
+++ b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libavutil-52.so
--- a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswresample-0.so
+++ b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswresample-0.so
--- a/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswscale-2.so
+++ b/jni/nv_avc_dec/ffmpeg/x86_64/lib/libswscale-2.so
--- a/jni/nv_opus_dec/libopus/arm64-v8a/libopus.a
+++ b/jni/nv_opus_dec/libopus/arm64-v8a/libopus.a
--- a/jni/nv_opus_dec/libopus/armeabi-v7a/libopus.a
+++ b/jni/nv_opus_dec/libopus/armeabi-v7a/libopus.a
--- a/jni/nv_opus_dec/libopus/build_android.sh
+++ b/jni/nv_opus_dec/libopus/build_android.sh
@@ -1,4 +1,4 @@
-ANDROID_API_TARGET=L
+ANDROID_API_TARGET=21
 PARALLEL_JOBS=$(nproc)

 rm -r ./android
--- a/jni/nv_opus_dec/libopus/mips/libopus.a
+++ b/jni/nv_opus_dec/libopus/mips/libopus.a
--- a/jni/nv_opus_dec/libopus/mips64/libopus.a
+++ b/jni/nv_opus_dec/libopus/mips64/libopus.a
--- a/jni/nv_opus_dec/libopus/x86/libopus.a
+++ b/jni/nv_opus_dec/libopus/x86/libopus.a
--- a/jni/nv_opus_dec/libopus/x86_64/libopus.a
+++ b/jni/nv_opus_dec/libopus/x86_64/libopus.a