video changes..
Merge branch 'master' of github.com:derekolson/mmlive