FFmpeg tab added.
Merge branch 'master' of https://github.com/benoitBrayer/StreaMe

Conflicts:
	controller.h
	mainwindow.cpp