Merge commit '25bb7eaf9eb14e6e00264bf584aa4d380d3bc29f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 12:47:29 +0000 (14:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 12:47:29 +0000 (14:47 +0200)
* commit '25bb7eaf9eb14e6e00264bf584aa4d380d3bc29f':
  hevc/intra_pred: drop unnecessary conditions in loops

Conflicts:
libavcodec/hevcpred_template.c

See: 053fdacde76a38186dc9db658572e38686efe0c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge