New ffmpeg

I needed the latest ffmpeg so I could split and merge video files better. In the process I had to update zlib due to the old version no longer being available. The patch for ffmpeg doesn't seem necessary on the latest ffmpeg either.