* commit 'd5c15ebeaf1914ea5e3e0599d4316d7c4cf74434': hevc: Fix modulo operations Conflicts: libavcodec/hevc.c libavcodec/hevc_filter.c See: 4ced5d7780 Merged-by: Michael Niedermayer <michaelni@gmx.at>
4ced5d7780