* commit '25bb7eaf9eb14e6e00264bf584aa4d380d3bc29f': hevc/intra_pred: drop unnecessary conditions in loops Conflicts: libavcodec/hevcpred_template.c See: 053fdacde7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
053fdacde7