bump to 1.2-1
Merge pull request #895 from davidbeauchamp/master

extra/x265 bump to 1.2-1