Merge "CCodec: don't release all references at flush"