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

Change-Id: I902bdc8ed990229670689715d61bb971f9861403