Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
liblinphone
Commits
6c4f1da9
Commit
6c4f1da9
authored
Nov 07, 2013
by
Simon Morlat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update ortp to fix conflict with gettimeofday defined both in ortp and
tunnel. update documentation
parent
062db87e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
README.mingw
README.mingw
+0
-4
coreapi/misc.c
coreapi/misc.c
+2
-2
oRTP
oRTP
+1
-1
No files found.
README.mingw
View file @
6c4f1da9
...
...
@@ -65,10 +65,6 @@ WARNING: During the build, windows might slow down suddenly. Using ctl+alt+del t
you might see a process 'LVpSRV.exe' or something like this that eats 90% of cpu.
Kill it. Don't know what it is, but once killed, windows runs normally.
#Compile and install tunnel (optional, available under proprietary licensing)
cd tunnel && ./autogen.sh && ./configure --prefix=/usr --enable-shared --disable-static && make && make install
#Build linphone itself:
#run autogen.sh after a git checkout or update
...
...
coreapi/misc.c
View file @
6c4f1da9
...
...
@@ -528,7 +528,7 @@ int linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){
}
got_audio
=
FALSE
;
got_video
=
FALSE
;
gettimeofday
(
&
init
,
NULL
);
ortp_
gettimeofday
(
&
init
,
NULL
);
do
{
int
id
;
...
...
@@ -561,7 +561,7 @@ int linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){
cone_video
=
TRUE
;
got_video
=
TRUE
;
}
gettimeofday
(
&
cur
,
NULL
);
ortp_
gettimeofday
(
&
cur
,
NULL
);
elapsed
=
((
cur
.
tv_sec
-
init
.
tv_sec
)
*
1000
.
0
)
+
((
cur
.
tv_usec
-
init
.
tv_usec
)
/
1000
.
0
);
if
(
elapsed
>
2000
)
{
ms_message
(
"Stun responses timeout, going ahead."
);
...
...
oRTP
@
b5d1414e
Subproject commit
120e58e2c12d608ecb7a2f0c4ae91768cb1862a0
Subproject commit
b5d1414e63b21c83eb8e26988a3fe423ff8fc3b3
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment