Removal of temporary code which became vf_watermark (overlay was taken by the ffmpeg project)
Update for latest ffmpeg.