Two types of Samadhi described in the Yoga Sturas are Samprajnata and Asamprajnata. Both are states of corresponding to the eighth step of Patanjali's Ashtanga Yoga.  Samprajnata means Samadhi with Prajna or highest wisdom. On the other hand, Asamprajnata has two prevalent definitions because scholars disagree on it.
Dhyana Meditation
To understand the difference between these two it is first important to clarify the definition of Yoga and Meditation. ‘Yoga’ today can mean either Hatha Yoga (Mastery over body ~ Asanas) or Raja Yoga (Mastery over mind ~ Meditation).
Vrikshasana Beatles Ashram
A look inside the intriguing Ashram of Maharishi Mahesh Yogi, more famous as the Beatles Ashram of Rishikesh