Commit cde2de4a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3505b196'

* commit '3505b196':
  hevc: derive partially amvp list

Conflicts:
	libavcodec/hevc_mvs.c

See: bbeaae96
See: 3ad04608Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e6ffe7bc 3505b196
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment