summaryrefslogtreecommitdiff
path: root/libavcodec/tiffenc.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-04-18 22:29:46 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-04-18 22:33:51 +0200
commitdddd06d5b48664212ace4bb510757e9bb221b598 (patch)
tree711d20e0722ef52bb08b7f01c930a98b35582921 /libavcodec/tiffenc.c
parente366e6bfab5c13970be2855d1031cb32aafa649e (diff)
Make tiff-in-mov QuickTime-compatible for more colour-spaces.
Fixes ticket #1228.
Diffstat (limited to 'libavcodec/tiffenc.c')
-rw-r--r--libavcodec/tiffenc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index d7165dc4ef..587e98e277 100644
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -252,23 +252,28 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
bpp_tab[3] = 16;
break;
case PIX_FMT_RGBA:
+ avctx->bits_per_coded_sample =
s->bpp = 32;
s->photometric_interpretation = 2;
break;
case PIX_FMT_RGB24:
+ avctx->bits_per_coded_sample =
s->bpp = 24;
s->photometric_interpretation = 2;
break;
case PIX_FMT_GRAY8:
+ avctx->bits_per_coded_sample = 0x28;
s->bpp = 8;
s->photometric_interpretation = 1;
break;
case PIX_FMT_PAL8:
+ avctx->bits_per_coded_sample =
s->bpp = 8;
s->photometric_interpretation = 3;
break;
case PIX_FMT_MONOBLACK:
case PIX_FMT_MONOWHITE:
+ avctx->bits_per_coded_sample =
s->bpp = 1;
s->photometric_interpretation = avctx->pix_fmt == PIX_FMT_MONOBLACK;
bpp_tab[0] = 1;