Merge "translate: Fix transcoding while different in frame size."
authorMatt Jordan <mjordan@digium.com>
Mon, 28 Sep 2015 21:24:19 +0000 (16:24 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 28 Sep 2015 21:24:19 +0000 (16:24 -0500)

Trivial merge