[FFmpeg-cvslog] Make png-in-mov QuickTime-compatible for more colour-spaces.

Carl Eugen Hoyos git at videolan.org
Mon Jun 11 10:58:37 CEST 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Jun 11 10:57:23 2012 +0200| [37f1a7d51d750f9bdf8bf6aba61f49bd9ae0565c] | committer: Carl Eugen Hoyos

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

Reported and tested by ami_stuff.

See ticket #1191.

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

 libavcodec/pngenc.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
index c29435b..7c9e8d5 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;



More information about the ffmpeg-cvslog mailing list