Merge "CCodec: Fix null check"