mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
Merge commit '25bb7eaf9eb14e6e00264bf584aa4d380d3bc29f'
* commit '25bb7eaf9eb14e6e00264bf584aa4d380d3bc29f': hevc/intra_pred: drop unnecessary conditions in loops Conflicts: libavcodec/hevcpred_template.c See: 053fdacde76a38186dc9db658572e38686efe0c4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
e98d3a7d51