Both (given that animal oils are solid at room temperature and become liquid once used).

Neither of those terms imo seem to describe what I would understand as 牛油, as they both require what appears to be more processing. I've actually never had 牛油 actually and I doubt it's very common...but we do fry pig fat for 豬油, so 牛油 for me would absolutely be an analogous product.