Don't require ffmpeg in OS X
Merge branch 'master' of github.com:pydata/conda-recipes