From 1322562fb5be74efa4cf7b29ddd702d8814f04b1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 22 Jan 2013 12:13:21 +0100
Subject: [PATCH] Added back X264 compilation as default

---
 Makefile                              | 2 +-
 res/layout/main.xml                   | 4 ++--
 src/org/linphone/LinphoneManager.java | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 48c0055f4..59bc3cf05 100644
--- a/Makefile
+++ b/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
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 42f657cea..5d2482705 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -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>
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index e158e332e..771742dbd 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -161,7 +161,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		videoInitiator = b;
 	}
 
-
 	private LinphoneManager(final Context c, LinphoneServiceListener listener) {
 		sExited=false;
 		mServiceContext = c;