Merge remote-tracking branch 'public/master' into 3.0.x

This commit is contained in:
Gautier Pelloux-Prayer 2015-11-30 16:53:19 +01:00
commit 9fade24b33
16 changed files with 13 additions and 28 deletions

6
.gitmodules vendored
View file

@ -7,12 +7,6 @@
[submodule "submodules/externals/speex"]
path = submodules/externals/speex
url = git://git.linphone.org/speex
[submodule "submodules/msilbc"]
path = submodules/msilbc
url = git://git.linphone.org/msilbc
[submodule "submodules/libilbc-rfc3951"]
path = submodules/libilbc-rfc3951
url = git://git.linphone.org/libilbc-rfc3951
[submodule "submodules/externals/opencore-amr"]
path = submodules/externals/opencore-amr
url = git://git.linphone.org/opencore-amr

Binary file not shown.

View file

@ -54,7 +54,6 @@
63D5C1301BA6E504002D1ABF /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */; };
63D5C1311BA6E504002D1ABF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10D1BA6E4F0002D1ABF /* libcunit.a */; };
63D5C1321BA6E504002D1ABF /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10E1BA6E4F0002D1ABF /* libgsm.a */; };
63D5C1331BA6E504002D1ABF /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */; };
63D5C1341BA6E504002D1ABF /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1101BA6E4F0002D1ABF /* liblinphone.a */; };
63D5C1351BA6E504002D1ABF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */; };
63D5C1361BA6E504002D1ABF /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */; };
@ -75,7 +74,6 @@
63D5C1461BA6E504002D1ABF /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1221BA6E4F0002D1ABF /* libx264.a */; };
63D5C1471BA6E516002D1ABF /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1251BA6E4F0002D1ABF /* libmsamr.a */; };
63D5C1481BA6E516002D1ABF /* libmsbcg729.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1261BA6E4F0002D1ABF /* libmsbcg729.a */; };
63D5C1491BA6E516002D1ABF /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1271BA6E4F0002D1ABF /* libmsilbc.a */; };
63D5C14A1BA6E516002D1ABF /* libmsopenh264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1281BA6E4F0002D1ABF /* libmsopenh264.a */; };
63D5C14B1BA6E516002D1ABF /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1291BA6E4F0002D1ABF /* libmssilk.a */; };
63D5C14C1BA6E516002D1ABF /* libmswebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C12A1BA6E4F0002D1ABF /* libmswebrtc.a */; };
@ -90,7 +88,6 @@
63D5C15B1BA6E765002D1ABF /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */; };
63D5C15C1BA6E765002D1ABF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10D1BA6E4F0002D1ABF /* libcunit.a */; };
63D5C15D1BA6E765002D1ABF /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10E1BA6E4F0002D1ABF /* libgsm.a */; };
63D5C15E1BA6E765002D1ABF /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */; };
63D5C15F1BA6E765002D1ABF /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1101BA6E4F0002D1ABF /* liblinphone.a */; };
63D5C1601BA6E765002D1ABF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */; };
63D5C1611BA6E765002D1ABF /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */; };
@ -111,7 +108,6 @@
63D5C1711BA6E765002D1ABF /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1221BA6E4F0002D1ABF /* libx264.a */; };
63D5C1721BA6E778002D1ABF /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1251BA6E4F0002D1ABF /* libmsamr.a */; };
63D5C1731BA6E778002D1ABF /* libmsbcg729.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1261BA6E4F0002D1ABF /* libmsbcg729.a */; };
63D5C1741BA6E778002D1ABF /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1271BA6E4F0002D1ABF /* libmsilbc.a */; };
63D5C1751BA6E778002D1ABF /* libmsopenh264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1281BA6E4F0002D1ABF /* libmsopenh264.a */; };
63D5C1761BA6E778002D1ABF /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1291BA6E4F0002D1ABF /* libmssilk.a */; };
63D5C1771BA6E778002D1ABF /* libmswebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C12A1BA6E4F0002D1ABF /* libmswebrtc.a */; };
@ -139,7 +135,6 @@
63D5C18E1BA6E92A002D1ABF /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */; };
63D5C18F1BA6E92A002D1ABF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10D1BA6E4F0002D1ABF /* libcunit.a */; };
63D5C1901BA6E92A002D1ABF /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10E1BA6E4F0002D1ABF /* libgsm.a */; };
63D5C1911BA6E92A002D1ABF /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */; };
63D5C1921BA6E92A002D1ABF /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1101BA6E4F0002D1ABF /* liblinphone.a */; };
63D5C1931BA6E92A002D1ABF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */; };
63D5C1941BA6E92A002D1ABF /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */; };
@ -168,7 +163,6 @@
63D5C1AC1BA6E95C002D1ABF /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */; };
63D5C1AD1BA6E95C002D1ABF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10D1BA6E4F0002D1ABF /* libcunit.a */; };
63D5C1AE1BA6E95C002D1ABF /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10E1BA6E4F0002D1ABF /* libgsm.a */; };
63D5C1AF1BA6E95C002D1ABF /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */; };
63D5C1B01BA6E95C002D1ABF /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1101BA6E4F0002D1ABF /* liblinphone.a */; };
63D5C1B11BA6E95C002D1ABF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */; };
63D5C1B21BA6E95C002D1ABF /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */; };
@ -225,7 +219,6 @@
63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbzrtp.a; path = "../liblinphone-sdk/apple-darwin/lib/libbzrtp.a"; sourceTree = "<group>"; };
63D5C10D1BA6E4F0002D1ABF /* libcunit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcunit.a; path = "../liblinphone-sdk/apple-darwin/lib/libcunit.a"; sourceTree = "<group>"; };
63D5C10E1BA6E4F0002D1ABF /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = "<group>"; };
63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbcrfc3951.a; path = "../liblinphone-sdk/apple-darwin/lib/libilbcrfc3951.a"; sourceTree = "<group>"; };
63D5C1101BA6E4F0002D1ABF /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = "<group>"; };
63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphonetester.a; path = "../liblinphone-sdk/apple-darwin/lib/liblinphonetester.a"; sourceTree = "<group>"; };
63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "../liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = "<group>"; };
@ -247,7 +240,6 @@
63D5C1221BA6E4F0002D1ABF /* libx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libx264.a; path = "../liblinphone-sdk/apple-darwin/lib/libx264.a"; sourceTree = "<group>"; };
63D5C1251BA6E4F0002D1ABF /* libmsamr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmsamr.a; sourceTree = "<group>"; };
63D5C1261BA6E4F0002D1ABF /* libmsbcg729.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmsbcg729.a; sourceTree = "<group>"; };
63D5C1271BA6E4F0002D1ABF /* libmsilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmsilbc.a; sourceTree = "<group>"; };
63D5C1281BA6E4F0002D1ABF /* libmsopenh264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmsopenh264.a; sourceTree = "<group>"; };
63D5C1291BA6E4F0002D1ABF /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmssilk.a; sourceTree = "<group>"; };
63D5C12A1BA6E4F0002D1ABF /* libmswebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmswebrtc.a; sourceTree = "<group>"; };
@ -267,7 +259,6 @@
files = (
63D5C1471BA6E516002D1ABF /* libmsamr.a in Frameworks */,
63D5C1481BA6E516002D1ABF /* libmsbcg729.a in Frameworks */,
63D5C1491BA6E516002D1ABF /* libmsilbc.a in Frameworks */,
63D5C14A1BA6E516002D1ABF /* libmsopenh264.a in Frameworks */,
63D5C14B1BA6E516002D1ABF /* libmssilk.a in Frameworks */,
63D5C14C1BA6E516002D1ABF /* libmswebrtc.a in Frameworks */,
@ -279,7 +270,6 @@
63D5C1301BA6E504002D1ABF /* libbzrtp.a in Frameworks */,
63D5C1311BA6E504002D1ABF /* libcunit.a in Frameworks */,
63D5C1321BA6E504002D1ABF /* libgsm.a in Frameworks */,
63D5C1331BA6E504002D1ABF /* libilbcrfc3951.a in Frameworks */,
63D5C1341BA6E504002D1ABF /* liblinphone.a in Frameworks */,
63D5C1351BA6E504002D1ABF /* liblinphonetester.a in Frameworks */,
63D5C1361BA6E504002D1ABF /* libmediastreamer_base.a in Frameworks */,
@ -339,7 +329,6 @@
63D5C17A1BA6E8BD002D1ABF /* libsqlite3.dylib in Frameworks */,
63D5C1721BA6E778002D1ABF /* libmsamr.a in Frameworks */,
63D5C1731BA6E778002D1ABF /* libmsbcg729.a in Frameworks */,
63D5C1741BA6E778002D1ABF /* libmsilbc.a in Frameworks */,
63D5C1751BA6E778002D1ABF /* libmsopenh264.a in Frameworks */,
63D5C1761BA6E778002D1ABF /* libmssilk.a in Frameworks */,
63D5C1771BA6E778002D1ABF /* libmswebrtc.a in Frameworks */,
@ -351,7 +340,6 @@
63D5C15B1BA6E765002D1ABF /* libbzrtp.a in Frameworks */,
63D5C15C1BA6E765002D1ABF /* libcunit.a in Frameworks */,
63D5C15D1BA6E765002D1ABF /* libgsm.a in Frameworks */,
63D5C15E1BA6E765002D1ABF /* libilbcrfc3951.a in Frameworks */,
63D5C15F1BA6E765002D1ABF /* liblinphone.a in Frameworks */,
63D5C1601BA6E765002D1ABF /* liblinphonetester.a in Frameworks */,
63D5C1611BA6E765002D1ABF /* libmediastreamer_base.a in Frameworks */,
@ -387,7 +375,6 @@
63D5C18E1BA6E92A002D1ABF /* libbzrtp.a in Frameworks */,
63D5C18F1BA6E92A002D1ABF /* libcunit.a in Frameworks */,
63D5C1901BA6E92A002D1ABF /* libgsm.a in Frameworks */,
63D5C1911BA6E92A002D1ABF /* libilbcrfc3951.a in Frameworks */,
63D5C1921BA6E92A002D1ABF /* liblinphone.a in Frameworks */,
63D5C1931BA6E92A002D1ABF /* liblinphonetester.a in Frameworks */,
63D5C1941BA6E92A002D1ABF /* libmediastreamer_base.a in Frameworks */,
@ -436,7 +423,6 @@
63D5C1AC1BA6E95C002D1ABF /* libbzrtp.a in Frameworks */,
63D5C1AD1BA6E95C002D1ABF /* libcunit.a in Frameworks */,
63D5C1AE1BA6E95C002D1ABF /* libgsm.a in Frameworks */,
63D5C1AF1BA6E95C002D1ABF /* libilbcrfc3951.a in Frameworks */,
63D5C1B01BA6E95C002D1ABF /* liblinphone.a in Frameworks */,
63D5C1B11BA6E95C002D1ABF /* liblinphonetester.a in Frameworks */,
63D5C1B21BA6E95C002D1ABF /* libmediastreamer_base.a in Frameworks */,
@ -539,7 +525,6 @@
63D5C10C1BA6E4F0002D1ABF /* libbzrtp.a */,
63D5C10D1BA6E4F0002D1ABF /* libcunit.a */,
63D5C10E1BA6E4F0002D1ABF /* libgsm.a */,
63D5C10F1BA6E4F0002D1ABF /* libilbcrfc3951.a */,
63D5C1101BA6E4F0002D1ABF /* liblinphone.a */,
63D5C1111BA6E4F0002D1ABF /* liblinphonetester.a */,
63D5C1121BA6E4F0002D1ABF /* libmediastreamer_base.a */,
@ -591,7 +576,6 @@
children = (
63D5C1251BA6E4F0002D1ABF /* libmsamr.a */,
63D5C1261BA6E4F0002D1ABF /* libmsbcg729.a */,
63D5C1271BA6E4F0002D1ABF /* libmsilbc.a */,
63D5C1281BA6E4F0002D1ABF /* libmsopenh264.a */,
63D5C1291BA6E4F0002D1ABF /* libmssilk.a */,
63D5C12A1BA6E4F0002D1ABF /* libmswebrtc.a */,

@ -1 +0,0 @@
Subproject commit 91b61e39fb9c5d3dc78691f3d6e4f1d65c8b0d2a

View file

@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
0F3BFC991BFCC7A10025B8DF /* libmswebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F3BFC981BFCC7A00025B8DF /* libmswebrtc.a */; };
1561A554178D9C68006B4B2F /* ioshardware.h in Headers */ = {isa = PBXBuildFile; fileRef = 1561A553178D9C68006B4B2F /* ioshardware.h */; };
1561A555178D9C71006B4B2F /* ioshardware.m in Sources */ = {isa = PBXBuildFile; fileRef = 1561A551178D98E2006B4B2F /* ioshardware.m */; };
2206D2D3177AC70900C40726 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2C6177AC70900C40726 /* InfoPlist.strings */; };
@ -320,9 +321,9 @@
22DD19C113A8D7FA0018ECD4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD19C013A8D7FA0018ECD4 /* UIKit.framework */; };
22DD19C213A8D7FA0018ECD4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
22DD19C413A8D7FA0018ECD4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD19C313A8D7FA0018ECD4 /* CoreGraphics.framework */; };
630DCF691BBAC06400A0DDC8 /* msvideopresets.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF661BBAC05100A0DDC8 /* msvideopresets.c */; settings = {ASSET_TAGS = (); }; };
630DCF6C1BBAC08200A0DDC8 /* rfc4103_textstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF6A1BBAC08200A0DDC8 /* rfc4103_textstream.c */; settings = {ASSET_TAGS = (); }; };
630DCF6D1BBAC08200A0DDC8 /* video_preset_high_fps.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF6B1BBAC08200A0DDC8 /* video_preset_high_fps.c */; settings = {ASSET_TAGS = (); }; };
630DCF691BBAC06400A0DDC8 /* msvideopresets.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF661BBAC05100A0DDC8 /* msvideopresets.c */; };
630DCF6C1BBAC08200A0DDC8 /* rfc4103_textstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF6A1BBAC08200A0DDC8 /* rfc4103_textstream.c */; };
630DCF6D1BBAC08200A0DDC8 /* video_preset_high_fps.c in Sources */ = {isa = PBXBuildFile; fileRef = 630DCF6B1BBAC08200A0DDC8 /* video_preset_high_fps.c */; };
7066FC0A13E830B800EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0913E830B800EFC6DC /* libvpx.a */; };
70E542EE13E147C7002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542ED13E147C7002BA2C0 /* OpenGLES.framework */; };
70E542F113E147CE002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F013E147CE002BA2C0 /* QuartzCore.framework */; };
@ -513,6 +514,8 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
0F3BFC961BFCC7420025B8DF /* liblinphone-sdk */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "liblinphone-sdk"; path = "../liblinphone-sdk"; sourceTree = "<group>"; };
0F3BFC981BFCC7A00025B8DF /* libmswebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmswebrtc.a; path = "../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmswebrtc.a"; sourceTree = "<group>"; };
1561A551178D98E2006B4B2F /* ioshardware.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ioshardware.m; sourceTree = "<group>"; };
1561A553178D9C68006B4B2F /* ioshardware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioshardware.h; sourceTree = "<group>"; };
2203127413A249F70049A2ED /* filter-template.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "filter-template.c"; sourceTree = "<group>"; };
@ -835,6 +838,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0F3BFC991BFCC7A10025B8DF /* libmswebrtc.a in Frameworks */,
2206D2DE177ACD3800C40726 /* libmediastreamer_voip.a in Frameworks */,
22AF73C01753F3E100BE8398 /* libopus.a in Frameworks */,
225D65CD1521C19A008B2E81 /* libortp.a in Frameworks */,
@ -1379,6 +1383,8 @@
F0ED99521A1645CD00A788CE /* Frameworks */ = {
isa = PBXGroup;
children = (
0F3BFC981BFCC7A00025B8DF /* libmswebrtc.a */,
0F3BFC961BFCC7420025B8DF /* liblinphone-sdk */,
AACBBE490F95108600F1A2B1 /* Foundation.framework */,
22DD19C013A8D7FA0018ECD4 /* UIKit.framework */,
22DD19C313A8D7FA0018ECD4 /* CoreGraphics.framework */,
@ -2596,6 +2602,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
HAVE_WEBRTC,
HAVE_SILK,
"_BYTE_ORDER=_LITTLE_ENDIAN",
ORTP_INET6,
@ -2822,6 +2829,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
HAVE_WEBRTC,
HAVE_SILK,
"_BYTE_ORDER=_LITTLE_ENDIAN",
ORTP_INET6,
@ -2868,6 +2876,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
HAVE_WEBRTC,
HAVE_SILK,
"_BYTE_ORDER=_LITTLE_ENDIAN",
ORTP_INET6,

@ -1 +0,0 @@
Subproject commit bf4815c4cf9574afeae7c6b28347b747085019fc

@ -1 +1 @@
Subproject commit 9f7b3128b9c6b396c89d784ba5ddfa68be05607a
Subproject commit 5787ddda77a8292898670ab8bd3d48e6e51ccfaa