Commit 932be89c authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a0e1c351'

* commit 'a0e1c351':
  hevc: remove unused array min_cb_addr_zs

Conflicts:
	libavcodec/hevc_ps.c

See: f7f1f4c7Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents acc7cf70 a0e1c351
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