Merge "chan_pjsip: Don't change formats when frame of unsupported format is received."
authorMatt Jordan <mjordan@digium.com>
Mon, 20 Jul 2015 12:31:43 +0000 (07:31 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 20 Jul 2015 12:31:43 +0000 (07:31 -0500)

Trivial merge