From 00991c22cc19660177b52b4b4c4dd90cd5ca610d Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 19 Apr 2012 16:35:29 +0200 Subject: [PATCH] Fix video preferences issue --- src/org/linphone/LinphonePreferencesActivity.java | 2 +- src/org/linphone/core/LinphoneCoreFactoryImpl.java | 4 +++- submodules/linphone | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/org/linphone/LinphonePreferencesActivity.java b/src/org/linphone/LinphonePreferencesActivity.java index bad4d5534..d14053265 100644 --- a/src/org/linphone/LinphonePreferencesActivity.java +++ b/src/org/linphone/LinphonePreferencesActivity.java @@ -621,7 +621,7 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E if (!Version.hasNeon()) { // Android without neon doesn't support H264 - findPreference(R.string.pref_video_codec_mpeg4_key).setEnabled(false); + findPreference(R.string.pref_video_codec_h264_key).setEnabled(false); } addEchoPrefsListener(); diff --git a/src/org/linphone/core/LinphoneCoreFactoryImpl.java b/src/org/linphone/core/LinphoneCoreFactoryImpl.java index 3dedd06d0..29f1c58ca 100644 --- a/src/org/linphone/core/LinphoneCoreFactoryImpl.java +++ b/src/org/linphone/core/LinphoneCoreFactoryImpl.java @@ -150,8 +150,10 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory { byte[] re = new byte[1024]; while(in.read(re) != -1){ String line = new String(re); - if (line.startsWith("Features")) + if (line.startsWith("Features")) { result = line.contains("neon"); + break; + } } in.close(); } catch(IOException ex){ diff --git a/submodules/linphone b/submodules/linphone index ec2bfe3f3..c0c9ebc21 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ec2bfe3f34e04b08e1410d2349e88ae700b4c271 +Subproject commit c0c9ebc214434556b50db8023e172048cf7a9866