these changes don't appear to be necessary
Merge branch 'master' of github.com:tolland/Custom-Video-Capture-with-Preview