mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-21 13:56:55 +00:00
Merge commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b'
* commit '3505b19652ea34089a4cd08d4d3358fcc0a3db8b': hevc: derive partially amvp list Conflicts: libavcodec/hevc_mvs.c See:bbeaae96eb
See:3ad0460831
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
cde2de4a05