Commit e98d3a7d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '25bb7eaf'

* commit '25bb7eaf':
  hevc/intra_pred: drop unnecessary conditions in loops

Conflicts:
	libavcodec/hevcpred_template.c

See: 053fdacdMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 45492018 25bb7eaf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment