virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
Reported and tested by ami_stuff.

See ticket #1191.
This commit is contained in:
Carl Eugen Hoyos 2012-06-11 10:57:23 +02:00
parent 20e46aafbd
commit 37f1a7d51d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/pngenc.c
View File

@ -242,10 +242,12 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
color_type = PNG_COLOR_TYPE_RGB; color_type = PNG_COLOR_TYPE_RGB;
break; break;
case PIX_FMT_RGBA: case PIX_FMT_RGBA:
avctx->bits_per_coded_sample = 32;
bit_depth = 8; bit_depth = 8;
color_type = PNG_COLOR_TYPE_RGB_ALPHA; color_type = PNG_COLOR_TYPE_RGB_ALPHA;
break; break;
case PIX_FMT_RGB24: case PIX_FMT_RGB24:
avctx->bits_per_coded_sample = 24;
bit_depth = 8; bit_depth = 8;
color_type = PNG_COLOR_TYPE_RGB; color_type = PNG_COLOR_TYPE_RGB;
break; break;
@ -254,6 +256,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
color_type = PNG_COLOR_TYPE_GRAY; color_type = PNG_COLOR_TYPE_GRAY;
break; break;
case PIX_FMT_GRAY8: case PIX_FMT_GRAY8:
avctx->bits_per_coded_sample = 0x28;
bit_depth = 8; bit_depth = 8;
color_type = PNG_COLOR_TYPE_GRAY; color_type = PNG_COLOR_TYPE_GRAY;
break; break;
@ -262,10 +265,12 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
color_type = PNG_COLOR_TYPE_GRAY_ALPHA; color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
break; break;
case PIX_FMT_MONOBLACK: case PIX_FMT_MONOBLACK:
avctx->bits_per_coded_sample =
bit_depth = 1; bit_depth = 1;
color_type = PNG_COLOR_TYPE_GRAY; color_type = PNG_COLOR_TYPE_GRAY;
break; break;
case PIX_FMT_PAL8: case PIX_FMT_PAL8:
avctx->bits_per_coded_sample =
bit_depth = 8; bit_depth = 8;
color_type = PNG_COLOR_TYPE_PALETTE; color_type = PNG_COLOR_TYPE_PALETTE;
break; break;