Merge "Binaural synthesis (confbridge): interleaved two-channel audio."
authorzuul <zuul@gerrit.asterisk.org>
Wed, 12 Oct 2016 16:36:06 +0000 (11:36 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 12 Oct 2016 16:36:06 +0000 (11:36 -0500)
1  2 
include/asterisk/channel.h
main/channel.c

Simple merge
diff --cc main/channel.c
Simple merge