OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Aug 2013 08:35:24 +0000 (10:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Aug 2013 08:47:14 +0000 (10:47 +0200)
commit1057390d916eb16d06111f7d50132f764ceb0e2e
treeda6f415fa88ffda09128af7dcd942e32c67d4562
parent7a48b1c49282d8386632301e77611dfbf5fd9834
parent46dee21a3238a5d9dfeeb1108dbad0beaa677035
Merge remote-tracking branch 'qatar/master'

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

Conflicts:
libavcodec/pngenc.c

See: fdc013da7863190b9416d45830a9ad6d7fb854c2

Merged-by: Michael Niedermayer <michaelni@gmx.at>