Merge "C2SoftAvcEnc: don't crash at unexpected input" into pi-dev
am: b6b349550f

Change-Id: I584459c25843b8824c8a86427137b49ba4c97f4a