Merge "codecs: Add Codec 2 mode 2400."

author Joshua Colp <jcolp@digium.com>

Sun, 4 Sep 2016 19:11:34 +0000 (14:11 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Sun, 4 Sep 2016 19:11:34 +0000 (14:11 -0500)
author Joshua Colp <jcolp@digium.com>
Sun, 4 Sep 2016 19:11:34 +0000 (14:11 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Sun, 4 Sep 2016 19:11:34 +0000 (14:11 -0500)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc include/asterisk/autoconfig.h.in
Simple merge
diff --cc main/codec_builtin.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Sun, 4 Sep 2016 19:11:34 +0000 (14:11 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Sun, 4 Sep 2016 19:11:34 +0000 (14:11 -0500)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
include/asterisk/autoconfig.h.in	patch \|	diff1 \|	diff2 \|	blob \| history
main/codec_builtin.c	patch \|	diff1 \|	diff2 \|	blob \| history