Better ffmpeg preview output
Merge remote-tracking branch 'upstream/master'