[FFmpeg-cvslog] Allow decoding of 64bit png images.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Jan 31 00:13:24 2012 +0100| [97da38c99bf5ad619ea15f2f1b4c050f0f44d11f] | committer: Carl Eugen Hoyos

Allow decoding of 64bit png images.

Fixes a part of ticket #639.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97da38c99bf5ad619ea15f2f1b4c050f0f44d11f
---

 libavcodec/pngdec.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 75f882c..41a91f2 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -485,6 +485,9 @@ static int decode_frame(AVCodecContext *avctx,
                 } else if (s->bit_depth == 16 &&
                            s->color_type == PNG_COLOR_TYPE_RGB) {
                     avctx->pix_fmt = PIX_FMT_RGB48BE;
+                } else if (s->bit_depth == 16 &&
+                           s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
+                    avctx->pix_fmt = PIX_FMT_RGBA64BE;
                 } else if (s->color_type == PNG_COLOR_TYPE_PALETTE) {
                     avctx->pix_fmt = PIX_FMT_PAL8;
                 } else if (s->bit_depth == 1) {