Merge branch 'master' into root

Conflicts: AndroidManifest.xml libs/limelight-common.jar res/values/strings.xml
2026-04-09 09:26:03 +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/libs/arm64-v8a/libavcodec-55.so
+++ b/libs/arm64-v8a/libavcodec-55.so
--- a/libs/arm64-v8a/libavformat-55.so
+++ b/libs/arm64-v8a/libavformat-55.so
--- a/libs/arm64-v8a/libavutil-52.so
+++ b/libs/arm64-v8a/libavutil-52.so
--- a/libs/arm64-v8a/libnv_avc_dec.so
+++ b/libs/arm64-v8a/libnv_avc_dec.so
--- a/libs/arm64-v8a/libnv_opus_dec.so
+++ b/libs/arm64-v8a/libnv_opus_dec.so
--- a/libs/arm64-v8a/libswresample-0.so
+++ b/libs/arm64-v8a/libswresample-0.so
--- a/libs/arm64-v8a/libswscale-2.so
+++ b/libs/arm64-v8a/libswscale-2.so
--- a/libs/armeabi-v7a/libavcodec-55.so
+++ b/libs/armeabi-v7a/libavcodec-55.so
--- a/libs/armeabi-v7a/libavformat-55.so
+++ b/libs/armeabi-v7a/libavformat-55.so
--- a/libs/armeabi-v7a/libavutil-52.so
+++ b/libs/armeabi-v7a/libavutil-52.so
--- a/libs/armeabi-v7a/libnv_avc_dec.so
+++ b/libs/armeabi-v7a/libnv_avc_dec.so
--- a/libs/armeabi-v7a/libnv_opus_dec.so
+++ b/libs/armeabi-v7a/libnv_opus_dec.so
--- a/libs/armeabi-v7a/libswresample-0.so
+++ b/libs/armeabi-v7a/libswresample-0.so
--- a/libs/armeabi-v7a/libswscale-2.so
+++ b/libs/armeabi-v7a/libswscale-2.so
--- a/libs/limelight-common.jar
+++ b/libs/limelight-common.jar
--- a/libs/mips/libavcodec-55.so
+++ b/libs/mips/libavcodec-55.so
--- a/libs/mips/libavformat-55.so
+++ b/libs/mips/libavformat-55.so
--- a/libs/mips/libavutil-52.so
+++ b/libs/mips/libavutil-52.so
--- a/libs/mips/libnv_avc_dec.so
+++ b/libs/mips/libnv_avc_dec.so
--- a/libs/mips/libnv_opus_dec.so
+++ b/libs/mips/libnv_opus_dec.so
--- a/libs/mips/libswresample-0.so
+++ b/libs/mips/libswresample-0.so
--- a/libs/mips/libswscale-2.so
+++ b/libs/mips/libswscale-2.so
--- a/libs/x86/libavcodec-55.so
+++ b/libs/x86/libavcodec-55.so
--- a/libs/x86/libavformat-55.so
+++ b/libs/x86/libavformat-55.so
--- a/libs/x86/libavutil-52.so
+++ b/libs/x86/libavutil-52.so
--- a/libs/x86/libnv_avc_dec.so
+++ b/libs/x86/libnv_avc_dec.so
--- a/libs/x86/libnv_opus_dec.so
+++ b/libs/x86/libnv_opus_dec.so
--- a/libs/x86/libswresample-0.so
+++ b/libs/x86/libswresample-0.so
--- a/libs/x86/libswscale-2.so
+++ b/libs/x86/libswscale-2.so
--- a/libs/x86_64/libavcodec-55.so
+++ b/libs/x86_64/libavcodec-55.so
--- a/libs/x86_64/libavformat-55.so
+++ b/libs/x86_64/libavformat-55.so
--- a/libs/x86_64/libavutil-52.so
+++ b/libs/x86_64/libavutil-52.so
--- a/libs/x86_64/libnv_avc_dec.so
+++ b/libs/x86_64/libnv_avc_dec.so
--- a/libs/x86_64/libnv_opus_dec.so
+++ b/libs/x86_64/libnv_opus_dec.so
--- a/libs/x86_64/libswresample-0.so
+++ b/libs/x86_64/libswresample-0.so
--- a/libs/x86_64/libswscale-2.so
+++ b/libs/x86_64/libswscale-2.so