Check for and use ffmpeg as well as avconv
Merge pull request #241 from sauyon/patch-1

Check for and use ffmpeg as well as avconv