Update Windows and Android FFMPEG to include mpegps, which fixes video support as implemented by the video-support branch.