RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Fixes ticket #1228.
This commit is contained in:
Carl Eugen Hoyos 2012-04-18 22:29:46 +02:00
parent e366e6bfab
commit dddd06d5b4
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/tiffenc.c
View File

@ -252,23 +252,28 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
bpp_tab[3] = 16; bpp_tab[3] = 16;
break; break;
case PIX_FMT_RGBA: case PIX_FMT_RGBA:
avctx->bits_per_coded_sample =
s->bpp = 32; s->bpp = 32;
s->photometric_interpretation = 2; s->photometric_interpretation = 2;
break; break;
case PIX_FMT_RGB24: case PIX_FMT_RGB24:
avctx->bits_per_coded_sample =
s->bpp = 24; s->bpp = 24;
s->photometric_interpretation = 2; s->photometric_interpretation = 2;
break; break;
case PIX_FMT_GRAY8: case PIX_FMT_GRAY8:
avctx->bits_per_coded_sample = 0x28;
s->bpp = 8; s->bpp = 8;
s->photometric_interpretation = 1; s->photometric_interpretation = 1;
break; break;
case PIX_FMT_PAL8: case PIX_FMT_PAL8:
avctx->bits_per_coded_sample =
s->bpp = 8; s->bpp = 8;
s->photometric_interpretation = 3; s->photometric_interpretation = 3;
break; break;
case PIX_FMT_MONOBLACK: case PIX_FMT_MONOBLACK:
case PIX_FMT_MONOWHITE: case PIX_FMT_MONOWHITE:
avctx->bits_per_coded_sample =
s->bpp = 1; s->bpp = 1;
s->photometric_interpretation = avctx->pix_fmt == PIX_FMT_MONOBLACK; s->photometric_interpretation = avctx->pix_fmt == PIX_FMT_MONOBLACK;
bpp_tab[0] = 1; bpp_tab[0] = 1;