Merge pull request #15120 from bkuhls/master-ffmpeg-parallel