From 42d4ce6e491cde2cbb5e9a611ba04d1323598e73 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Wed, 16 May 2012 12:36:10 +0200
Subject: [PATCH 1/3] Update oRTP and add genericplc to POTFILES.skip

---
 oRTP             | 2 +-
 po/POTFILES.skip | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/oRTP b/oRTP
index ff0da4b42..6f2a1cbad 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit ff0da4b42661d9996753372cb35dc0f25f5ff6ec
+Subproject commit 6f2a1cbad342f448140e0bbab6a2771443efceeb
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d1c11e80e..49808b8ef 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -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

From e1c1375b45ebf6ab23b3a655ca53d964d7fa08e2 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Wed, 16 May 2012 14:43:49 +0200
Subject: [PATCH 2/3] Update oRTP

---
 oRTP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oRTP b/oRTP
index 6f2a1cbad..52db5d9dd 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 6f2a1cbad342f448140e0bbab6a2771443efceeb
+Subproject commit 52db5d9ddbb28a85b1a9ede6598c9405cfe0b418

From d39e3932213bd2c3817b9080958e64f0c994c790 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Wed, 16 May 2012 15:42:04 +0200
Subject: [PATCH 3/3] Change rtp-timestamp option to ntp-timestamp

---
 configure.ac   | 12 ++++++------
 mediastreamer2 |  2 +-
 oRTP           |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index a56a93cbd..de51fbc1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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]],
diff --git a/mediastreamer2 b/mediastreamer2
index eae923bd8..20b28098f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit eae923bd8fd87476f0dddcde6d54824147d031fb
+Subproject commit 20b28098fa2b95fd2489fdbd73202e2b4807d4ab
diff --git a/oRTP b/oRTP
index 52db5d9dd..2a36f8669 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 52db5d9ddbb28a85b1a9ede6598c9405cfe0b418
+Subproject commit 2a36f8669ea5a9499017711c53a311bea69e0ee3