Added back X264 compilation as default
This commit is contained in:
parent
07a0c183d0
commit
1322562fb5
3 changed files with 3 additions and 4 deletions
2
Makefile
2
Makefile
|
@ -8,7 +8,7 @@ LINPHONE_VERSION=$(shell cd submodules/linphone && git describe)
|
|||
LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe)
|
||||
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_AMRWB=0
|
||||
BUILD_GPLV3_ZRTP=0
|
||||
|
|
|
@ -109,7 +109,7 @@
|
|||
android:layout_alignParentTop="true"
|
||||
android:background="@drawable/missed_calls_bg"
|
||||
android:gravity="center"
|
||||
android:textSize="20dp"
|
||||
android:textSize="20sp"
|
||||
android:visibility="gone" />
|
||||
</RelativeLayout>
|
||||
|
||||
|
@ -143,7 +143,7 @@
|
|||
android:layout_alignParentTop="true"
|
||||
android:background="@drawable/missed_calls_bg"
|
||||
android:gravity="center"
|
||||
android:textSize="20dp"
|
||||
android:textSize="20sp"
|
||||
android:visibility="gone" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
|
@ -161,7 +161,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
|
|||
videoInitiator = b;
|
||||
}
|
||||
|
||||
|
||||
private LinphoneManager(final Context c, LinphoneServiceListener listener) {
|
||||
sExited=false;
|
||||
mServiceContext = c;
|
||||
|
|
Loading…
Reference in a new issue