Merge commit '5c3fa74b94'

Browse source

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

Conflicts:
	libavcodec/hevc.c

See: 0afa254d4e
See: a7e300649a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2013-12-21 01:02:14 +01:00

parent 9567162237 5c3fa74b94

commit 88839718b5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available