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

Fix video preferences issue

Browse source
This commit is contained in:
Sylvain Berfini 2012-04-19 16:35:29 +02:00
parent 81fc525350
commit 00991c22cc
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/LinphonePreferencesActivity.java
View file

@ -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();

4
src/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -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){

2
submodules/linphone

@ -1 +1 @@
Subproject commit ec2bfe3f34e04b08e1410d2349e88ae700b4c271
Subproject commit c0c9ebc214434556b50db8023e172048cf7a9866