Updated ffmpeg subs implementation
Merge remote-tracking branch 'UMS/master'