Merge "CCodec: buffer handling refactoring"