Tweak to build and maybe run with current FFmpeg git.