removed asm by default
Merge branch 'hevc' of https://github.com/OpenHEVC/FFmpeg.git into hevc

Conflicts:
	libavcodec/x86/hevcdsp_init.c