update for ffmpeg/ffprobe 2.1.2 and whitespace cleanup