* commit '04db5794cd97e4b33ec2f963ef7f967722a456eb': hevc: templatize pred_planar Conflicts: libavcodec/hevcpred_template.c See: 053fdacde7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
053fdacde7