* commit 'c9f8809e':
  hevc/intra_pred: simplify neighboring sample derivation

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