Commit 3731c409 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'cccac765'

* commit 'cccac765':
  png: Support rgb48 and rgba64 encoding

Conflicts:
	libavcodec/pngenc.c

See: f94ce3bcMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a00d4c59 cccac765
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