CCodec: fix corner cases am: ae9e2acb48
am: d3a6c2c493  -s ours

Change-Id: I0703965f63af39ee7656f52dc4e0482d22cfe92a