diff --git a/src/org/linphone/LinphonePreferencesActivity.java b/src/org/linphone/LinphonePreferencesActivity.java
index 259372067..68fc80648 100644
--- a/src/org/linphone/LinphonePreferencesActivity.java
+++ b/src/org/linphone/LinphonePreferencesActivity.java
@@ -96,7 +96,7 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E
 		detectAudioCodec(pref_codec_amr_key,"AMR",8000);
 
 		// No video
-		if (Version.sdkStrictlyBelow(5) || !fastCpu || !LinphoneManager.getInstance().hasCamera()) {
+		if (Version.sdkStrictlyBelow(5) || !Version.hasNeon() || !LinphoneManager.getInstance().hasCamera()) {
 			uncheckAndDisableCheckbox(pref_video_enable_key);
 		}
 		if (prefs().getBoolean(LinphoneActivity.PREF_FIRST_LAUNCH,true)) {
diff --git a/src/org/linphone/core/Version.java b/src/org/linphone/core/Version.java
index 8064cb176..9701b75c3 100644
--- a/src/org/linphone/core/Version.java
+++ b/src/org/linphone/core/Version.java
@@ -25,7 +25,7 @@ import android.os.Build;
  * @author Guillaume Beraudo
  */
 public class Version {
-
+	private static native boolean nativeHasNeon();
 	private static final int buildVersion = 
 		Integer.parseInt(Build.VERSION.SDK);
 //		8; // 2.2
@@ -50,6 +50,8 @@ public class Version {
 		} catch (Throwable e) {}
 		return false;
 	}
+	public static boolean hasNeon(){
+		return nativeHasNeon();
+	}
 
-
-}
\ No newline at end of file
+}
diff --git a/submodules/linphone b/submodules/linphone
index 749c984e8..47e2ef29c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 749c984e862a617146869cee5b1de5de3bfc6103
+Subproject commit 47e2ef29c779dd9b1dd1e767902365c12c04a4c7