fix weighted unweighted
Merge branch 'hevc' of https://github.com/OpenHEVC/openHEVC.git into
hevc

Conflicts:
	libavcodec/x86/hevcdsp_init.c