From 80fe123e62dad8317e724640e4ad81bd53beca66 Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Tue, 24 Feb 2015 12:58:19 +0100
Subject: [PATCH] Add configure switch to enable usage of g729 Annex B in
 RFC3389 Comfort Noise payload

---
 configure.ac   | 10 ++++++++++
 mediastreamer2 |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index bde0a2872..d696bf31b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -638,6 +638,16 @@ AC_ARG_ENABLE(dtls,
 	[dtls=false]
 )
 
+AC_ARG_ENABLE(g729bCN,
+	[AS_HELP_STRING([--enable-g729bCN], [Turn on or off usage of G729AnnexB in RFC3389 implementation of Comfort Noise Payload (default=no)])],
+	[case "${enableval}" in
+		yes)	g729bCN=true ;;
+		no)	g729bCN=false ;;
+		*)	AC_MSG_ERROR(bad value ${enableval} for --enable-g729bCN) ;;
+	esac],
+	[g729bCN=false]
+)
+
 dnl build console if required
 AM_CONDITIONAL(BUILD_CONSOLE, test x$console_ui = xtrue)
 
diff --git a/mediastreamer2 b/mediastreamer2
index 3d23e9d8a..680421e38 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 3d23e9d8aee73fae6fc6bf68f432d43c00828c96
+Subproject commit 680421e382ac666d58866f00e1ac5693d939fc07