Attempt to get Britz/FFmpeg back into FFmpeg/FFmpeg