Bump ffmpeg version.
Merge master.