projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5be65ac)
Disabled OpenH264 in default android build.
authorArmin Novak <armin.novak@thincast.com>
Wed, 18 Jan 2017 15:52:52 +0000 (16:52 +0100)
committerArmin Novak <armin.novak@thincast.com>
Wed, 18 Jan 2017 15:52:52 +0000 (16:52 +0100)
scripts/android-build-32.conf patch | blob | history
scripts/android-build-64.conf patch | blob | history
scripts/android-build.conf patch | blob | history

diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf
index 36e821e..c2c43d5 100644 (file)
--- a/scripts/android-build-32.conf
+++ b/scripts/android-build-32.conf
@@ -10,7 +10,7 @@
 #       create seperate configurations for each NDK API level
 #       and architecture you want to support.
 WITH_JPEG=0
-WITH_OPENH264=1
+WITH_OPENH264=0
 WITH_OPENSSL=1
 BUILD_DEPS=1
 DEPS_ONLY=0
diff --git a/scripts/android-build-64.conf b/scripts/android-build-64.conf
index aafe72f..c7f6e81 100644 (file)
--- a/scripts/android-build-64.conf
+++ b/scripts/android-build-64.conf
@@ -10,7 +10,7 @@
 #       create seperate configurations for each NDK API level
 #       and architecture you want to support.
 WITH_JPEG=0
-WITH_OPENH264=1
+WITH_OPENH264=0
 WITH_OPENSSL=1
 BUILD_DEPS=1
 DEPS_ONLY=0
diff --git a/scripts/android-build.conf b/scripts/android-build.conf
index 510028e..4d92606 100644 (file)
--- a/scripts/android-build.conf
+++ b/scripts/android-build.conf
@@ -10,7 +10,7 @@
 #       create seperate configurations for each NDK API level
 #       and architecture you want to support.
 WITH_JPEG=0
-WITH_OPENH264=1
+WITH_OPENH264=0
 WITH_OPENSSL=1
 BUILD_DEPS=1
 DEPS_ONLY=0
Domain: Graphics System / Display Server;