Cleanup FFmpeg and fix S10 build