Merge "media: Add experimental support for RTCP feedback."

author George Joseph <gjoseph@digium.com>

Fri, 27 Jan 2017 13:04:52 +0000 (07:04 -0600)

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

Fri, 27 Jan 2017 13:04:52 +0000 (07:04 -0600)
author George Joseph <gjoseph@digium.com>
Fri, 27 Jan 2017 13:04:52 +0000 (07:04 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 27 Jan 2017 13:04:52 +0000 (07:04 -0600)
diff --cc include/asterisk/frame.h
Simple merge
diff --cc include/asterisk/translate.h
Simple merge
diff --cc main/channel.c
Simple merge
diff --cc main/frame.c
Simple merge
diff --cc res/res_rtp_asterisk.c
Simple merge
author	George Joseph <gjoseph@digium.com>
	Fri, 27 Jan 2017 13:04:52 +0000 (07:04 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Fri, 27 Jan 2017 13:04:52 +0000 (07:04 -0600)
		1	2
include/asterisk/frame.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/asterisk/translate.h	patch \|	diff1 \|	diff2 \|	blob \| history
main/channel.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/frame.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_rtp_asterisk.c	patch \|	diff1 \|	diff2 \|	blob \| history