update for ffmpeg/ffprobe 2.1.2 and whitespace cleanup

built and tested on OS X 10.9.1 with ruby 2.1.0