Merge branch 'master' of http://repo.or.cz/r/FFMpeg-mirror