Merge branch 'master' of https://github.com/cjenkin2/EHWE-21
Removed h263 and mpeg2 (again)