Merge "res_pjsip_sdp_rtp: No rtpmap for static RTP payload IDs in SDP."

author Jenkins2 <jenkins2@gerrit.asterisk.org>

Wed, 26 Apr 2017 15:44:00 +0000 (10:44 -0500)

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

Wed, 26 Apr 2017 15:44:00 +0000 (10:44 -0500)
author Jenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 26 Apr 2017 15:44:00 +0000 (10:44 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 26 Apr 2017 15:44:00 +0000 (10:44 -0500)
diff --cc channels/chan_sip.c
Simple merge
diff --cc main/rtp_engine.c
Simple merge
diff --cc res/res_pjsip_sdp_rtp.c
Simple merge
author	Jenkins2 <jenkins2@gerrit.asterisk.org>
	Wed, 26 Apr 2017 15:44:00 +0000 (10:44 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 26 Apr 2017 15:44:00 +0000 (10:44 -0500)
		1	2
channels/chan_sip.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/rtp_engine.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip_sdp_rtp.c	patch \|	diff1 \|	diff2 \|	blob \| history