Yes, both are completely different. Yoga includes yama, niyama, aasana, pranayama, pratyahar, dhyana, dharana and samadhi. Yoga is also said to be a way of life and when practised gives all-round benefits. Meditation is a part of yoga, which deals with mental relaxation and concentration. Here, attention is focused on thoughts and breath.