Merge with ffmpeg
Merge branch 'hevc' of https://github.com/OpenHEVC/openHEVC.git into hevc