Merge "Binaural synthesis (confbridge): interleaved two-channel audio."

author zuul <zuul@gerrit.asterisk.org>

Wed, 12 Oct 2016 16:36:06 +0000 (11:36 -0500)

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

Wed, 12 Oct 2016 16:36:06 +0000 (11:36 -0500)
author zuul <zuul@gerrit.asterisk.org>
Wed, 12 Oct 2016 16:36:06 +0000 (11:36 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 12 Oct 2016 16:36:06 +0000 (11:36 -0500)
diff --cc include/asterisk/channel.h
Simple merge
diff --cc main/channel.c
Simple merge
author	zuul <zuul@gerrit.asterisk.org>
	Wed, 12 Oct 2016 16:36:06 +0000 (11:36 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 12 Oct 2016 16:36:06 +0000 (11:36 -0500)
		1	2
include/asterisk/channel.h	patch \|	diff1 \|	diff2 \|	blob \| history
main/channel.c	patch \|	diff1 \|	diff2 \|	blob \| history