Is the samadhi of Yoga the samadhi of Buddhism?

I was wondering if the samadhi of Patanjali Yoga meant the same thing as the samadhi of Buddhism? A Buddhist friend told me that no, and that Buddhism had higher states after the nirvikalpa samadhi of yogis. But at the same time when I read the descriptions of the two they look similar to me and the samadhi of Buddhism is also the last stage of the Noble Eightfold Path.