Handle booth ffmpeg/avconv
Remove TODO: no longer needed