Merge pull request #1 from mattalbright/master

Fixes for ffmpeg and Mac OSX