PNG 16-bit gray decoding support

Originally committed as revision 6779 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/png.c b/libavcodec/png.c
index 6d588c3..a257492 100644 (file)
--- a/libavcodec/png.c
+++ b/libavcodec/png.c
@@ -567,6 +567,9 @@ static int decode_frame(AVCodecContext *avctx,
                 } else if (s->bit_depth == 8 &&
                            s->color_type == PNG_COLOR_TYPE_GRAY) {
                     avctx->pix_fmt = PIX_FMT_GRAY8;
+                } else if (s->bit_depth == 16 &&
+                           s->color_type == PNG_COLOR_TYPE_GRAY) {
+                    avctx->pix_fmt = PIX_FMT_GRAY16BE;
                 } else if (s->bit_depth == 1 &&
                            s->color_type == PNG_COLOR_TYPE_GRAY) {
                     avctx->pix_fmt = PIX_FMT_MONOBLACK;