mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-23 14:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.linphone.org:linphone

Browse source
This commit is contained in:
Simon Morlat 2012-11-08 19:23:11 +01:00
commit 80f960862e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/impl/org/linphone/core/LinphoneCoreImpl.java
View file

@ -745,7 +745,7 @@ class LinphoneCoreImpl implements LinphoneCore {
@Override
public PayloadType findPayloadType(String mime, int clockRate) {
return null;
return findPayloadType(mime, clockRate, 1);
}
private native void removeFriend(long ptr, long lf);

2
mediastreamer2

@ -1 +1 @@
Subproject commit f743c8b4ab7ec010a96aa53f2e179cea69bfb4e6
Subproject commit 32e01d97d819cba4e16bd603f1dab33ef2a3a281