Merge branch 'master' of git://git.ffmpeg.org/ffmpeg into lagarith