-
Michael Niedermayer authored
* commit 'ed53cc21': hevc: derive partial merge list Conflicts: libavcodec/hevc_mvs.c See: 4576eff0Merged-by: Michael Niedermayer <michaelni@gmx.at>
5195512a
* commit 'ed53cc21': hevc: derive partial merge list Conflicts: libavcodec/hevc_mvs.c See: 4576eff0Merged-by: Michael Niedermayer <michaelni@gmx.at>