Commit 88839718 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5c3fa74b'

* commit '5c3fa74b':
  hevc: support luma bit depth != chroma bit depth for PCM coding units

Conflicts:
	libavcodec/hevc.c

See: 0afa254d
See: a7e30064Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 95671622 5c3fa74b
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