From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Sun, 20 Jul 2014 21:54:27 +0000 (+0100)
Subject: png: support reading gray+alpha at 16 bits
X-Git-Tag: v11_alpha1~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe;p=platform%2Fupstream%2Flibav.git

png: support reading gray+alpha at 16 bits
---

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 0c4c91a..fa7f7cc 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -500,6 +500,9 @@ static int decode_frame(AVCodecContext *avctx,
                 } else if (s->bit_depth == 8 &&
                            s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
                     avctx->pix_fmt = AV_PIX_FMT_YA8;
+                } else if (s->bit_depth == 16 &&
+                           s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+                    avctx->pix_fmt = AV_PIX_FMT_YA16BE;
                 } else {
                     goto fail;
                 }