Commit 1057390d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  png: allow encoding 16-bit grayscale

Conflicts:
	libavcodec/pngenc.c

See: fdc013daMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7a48b1c4 46dee21a
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