Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added back X264 compilation as default

Browse source
This commit is contained in:
Sylvain Berfini 2013-01-22 12:13:21 +01:00
parent 07a0c183d0
commit 1322562fb5
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -8,7 +8,7 @@ LINPHONE_VERSION=$(shell cd submodules/linphone && git describe)
LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe) LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe)
ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1) ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1)
BUILD_X264=0 BUILD_X264=1
BUILD_AMRNB=full # 0, light or full BUILD_AMRNB=full # 0, light or full
BUILD_AMRWB=0 BUILD_AMRWB=0
BUILD_GPLV3_ZRTP=0 BUILD_GPLV3_ZRTP=0

4
res/layout/main.xml
View file

@ -109,7 +109,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:background="@drawable/missed_calls_bg" android:background="@drawable/missed_calls_bg"
android:gravity="center" android:gravity="center"
android:textSize="20dp" android:textSize="20sp"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
@ -143,7 +143,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:background="@drawable/missed_calls_bg" android:background="@drawable/missed_calls_bg"
android:gravity="center" android:gravity="center"
android:textSize="20dp" android:textSize="20sp"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>

1
src/org/linphone/LinphoneManager.java
View file

@ -161,7 +161,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
videoInitiator = b; videoInitiator = b;
} }
private LinphoneManager(final Context c, LinphoneServiceListener listener) { private LinphoneManager(final Context c, LinphoneServiceListener listener) {
sExited=false; sExited=false;
mServiceContext = c; mServiceContext = c;