Merge pull request #8611 from remitamine/ffmpegfd