Apply haylocki's ffmpeg fixes. Closes #20.