Merge "pjsip: Extend 'asymmetric_rtp_codec' option to include us changing." into 13

diff --cc CHANGES
Simple merge

diff --cc channels/chan_pjsip.c
Simple merge