mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove apple-store specific changes for non-inclusion of FFMPEG and X264

Browse source 
- update the default configuration to use TLS as default
- remove the HAVE_SSL flag (not needed anymore)

This makes the apple_store branch closer to master.
This commit is contained in:
Guillaume BIENKOWSKI 2013-10-11 17:19:33 +02:00
parent 1e27d3d3d7
commit f3b8c3c787
4 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Classes/LinphoneManager.m
View file

@ -918,23 +918,8 @@ static LinphoneCoreVTable linphonec_vtable = {
linphone_core_enable_video(theLinphoneCore, FALSE, FALSE);
}
// Disable H264
{
PayloadType *pt=linphone_core_find_payload_type(theLinphoneCore,"h264",90000,-1);
if (pt) {
linphone_core_enable_payload_type(theLinphoneCore,pt,FALSE);
[LinphoneLogger logc:LinphoneLoggerWarning format:"h264/90000 disabled for Apple store"];
}
}
// Disable MPEG4
{
PayloadType *pt=linphone_core_find_payload_type(theLinphoneCore,"mp4v-es",90000,-1);
if (pt) {
linphone_core_enable_payload_type(theLinphoneCore,pt,FALSE);
[LinphoneLogger logc:LinphoneLoggerWarning format:"mp4v-es/90000 disabled for Apple store"];
}
}
[LinphoneLogger logc:LinphoneLoggerWarning format:"Linphone [%s] started on [%s]"
,linphone_core_get_version()

4
Resources/linphonerc-factory~ipad
View file

@ -33,12 +33,12 @@ max_calls=3
[wizard]
service_url=https://www.linphone.org/wizard.php
domain=sip.linphone.org
proxy=sip.linphone.org:5228
proxy=sip.linphone.org:5223
password_length=6
username_length=4
expires=604800
push_notification=1
transport=tcp
transport=tls
sharing_server=https://www.linphone.org:444/upload.php
ice=1
stun=stun.linphone.org

2
linphone-Info.plist
View file

@ -59,7 +59,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.5.102</string>
<string>3.5.101</string>
<key>CFBundleURLTypes</key>
<array>
<dict>

4
linphone.xcodeproj/project.pbxproj
View file

@ -5772,6 +5772,7 @@
VIDEO_ENABLED,
HAVE_X264,
HAVE_SILK,
HAVE_SSL,
DEBUG,
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
@ -5837,6 +5838,7 @@
VIDEO_ENABLED,
HAVE_X264,
HAVE_SILK,
HAVE_SSL,
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = (
@ -6042,6 +6044,7 @@
IN_LINPHONE,
VIDEO_ENABLED,
HAVE_SILK,
HAVE_SSL,
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = (
@ -6105,6 +6108,7 @@
IN_LINPHONE,
VIDEO_ENABLED,
HAVE_SILK,
HAVE_SSL,
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = (