Update ffmpegX for new naming conventions
Merge pull request #1633 from Cottser/ffmpegx

Update ffmpegX for new naming conventions