Merge commit 'c9f8809ee4c576d5833865039bc1c85754448f67'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 13:03:42 +0000 (15:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 13:03:42 +0000 (15:03 +0200)
commit3791741cf97f6803f7ec1beb8da025f1f779e845
treecebc35efc041ab95fbb91fe77eaf459724e97761
parente98d3a7d51da037d06f5e3c113ef7c8b69c2467a
parentc9f8809ee4c576d5833865039bc1c85754448f67
Merge commit 'c9f8809ee4c576d5833865039bc1c85754448f67'

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

Conflicts:
libavcodec/hevcpred_template.c

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