Update to Gotham final

A late patch to the Makefile and configure files required a
tweak of the ffmpeg patch.