Merge "CCodec: push a blank buffer at the end correctly"