ffmpeg2 updates

I thought I PR these before I squash and rebase and our branches deviate a lot again.