From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Mon, 11 Jun 2012 08:57:23 +0000 (+0200)
Subject: Make png-in-mov QuickTime-compatible for more colour-spaces.
X-Git-Tag: android-x86-4.4-r1~11296
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=37f1a7d51d750f9bdf8bf6aba61f49bd9ae0565c;p=android-x86%2Fexternal-ffmpeg.git

Make png-in-mov QuickTime-compatible for more colour-spaces.

Reported and tested by ami_stuff.

See ticket #1191.
---

diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
index c29435b1a8..7c9e8d5b3e 100644
--- a/libavcodec/pngenc.c
+++ b/libavcodec/pngenc.c
@@ -242,10 +242,12 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         color_type = PNG_COLOR_TYPE_RGB;
         break;
     case PIX_FMT_RGBA:
+        avctx->bits_per_coded_sample = 32;
         bit_depth = 8;
         color_type = PNG_COLOR_TYPE_RGB_ALPHA;
         break;
     case PIX_FMT_RGB24:
+        avctx->bits_per_coded_sample = 24;
         bit_depth = 8;
         color_type = PNG_COLOR_TYPE_RGB;
         break;
@@ -254,6 +256,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         color_type = PNG_COLOR_TYPE_GRAY;
         break;
     case PIX_FMT_GRAY8:
+        avctx->bits_per_coded_sample = 0x28;
         bit_depth = 8;
         color_type = PNG_COLOR_TYPE_GRAY;
         break;
@@ -262,10 +265,12 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
         break;
     case PIX_FMT_MONOBLACK:
+        avctx->bits_per_coded_sample =
         bit_depth = 1;
         color_type = PNG_COLOR_TYPE_GRAY;
         break;
     case PIX_FMT_PAL8:
+        avctx->bits_per_coded_sample =
         bit_depth = 8;
         color_type = PNG_COLOR_TYPE_PALETTE;
         break;