-
Michael Niedermayer authored
* commit 'd1b1c3bb': hevc: reorder loops Conflicts: libavcodec/hevc.c See: eca1957cMerged-by: Michael Niedermayer <michaelni@gmx.at>
2278146a
* commit 'd1b1c3bb': hevc: reorder loops Conflicts: libavcodec/hevc.c See: eca1957cMerged-by: Michael Niedermayer <michaelni@gmx.at>