Change display video mainwindow

Signed-off-by: RomaricDel <delaunoy.r@gmail.com>
gitignore

Signed-off-by: RomaricDel <delaunoy.r@gmail.com>
Merge branch 'master' of https://github.com/benoitBrayer/StreaMe

Conflicts:
	mainwindow.h