Merge branch 'master' of git://git.videolan.org/ffmpeg