mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-21 21:28:08 +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:
Yann Diorcet 2012-05-16 15:42:28 +02:00
commit 455bb0eee6
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -246,13 +246,13 @@ fi
AC_SUBST(IPV6_CFLAGS)
dnl enable timestamp support
AC_ARG_ENABLE(rtp-timestamp,
[ --enable-rtp-timestamp Turn on RTP packet timestamp],
AC_ARG_ENABLE(ntp-timestamp,
[ --enable-ntp-timestamp Turn on NTP timestamping on received packet],
[case "${enableval}" in
yes) rtptimestamp=true;;
no) rtptimestamp=false;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-rtp-timestamp) ;;
esac],[rtptimestamp=false])
yes) ntptimestamp=true;;
no) ntptimestamp=false;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-ntp-timestamp) ;;
esac],[ntptimestamp=false])
AC_ARG_ENABLE(debug,
[ --enable-debug=[yes/no] enables the display of traces showing the execution of the library. [default=yes]],

2
mediastreamer2

@ -1 +1 @@
Subproject commit eae923bd8fd87476f0dddcde6d54824147d031fb
Subproject commit 20b28098fa2b95fd2489fdbd73202e2b4807d4ab

2
oRTP

@ -1 +1 @@
Subproject commit ff0da4b42661d9996753372cb35dc0f25f5ff6ec
Subproject commit 2a36f8669ea5a9499017711c53a311bea69e0ee3

1
po/POTFILES.skip
View file

@ -12,6 +12,7 @@ mediastreamer2/src/extdisplay.c
mediastreamer2/src/gsm.c
mediastreamer2/src/ice.c
mediastreamer2/src/itc.c
mediastreamer2/src/genericplc.c
mediastreamer2/src/macsnd.c
mediastreamer2/src/msandroid.cpp
mediastreamer2/src/msandroidvideo.cpp