Contribs

I ported ffmpeg and had that merged.