Updated master to latest ffmpeg version.

Work sponsored by SVT.