* commit 'a1c2b480':
  hevc: templatize intra_pred

Conflicts:
	libavcodec/hevc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>