From f694ca7ca7a6a7067f612b30e495b7cf4df61a7d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 29 Apr 2014 18:39:24 +0200 Subject: [PATCH] avcodec/tiff: support 4:2:2 and 4:1:1 YCbCr Signed-off-by: Michael Niedermayer --- libavcodec/tiff.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index d4fba0dcc2..4d20b1cf0e 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -590,6 +590,10 @@ static int init_image(TiffContext *s, ThreadFrame *frame) if (s->photometric == TIFF_PHOTOMETRIC_YCBCR) { if (s->subsampling[0] == 1 && s->subsampling[1] == 1) { s->avctx->pix_fmt = AV_PIX_FMT_YUV444P; + } else if (s->subsampling[0] == 2 && s->subsampling[1] == 1) { + s->avctx->pix_fmt = AV_PIX_FMT_YUV422P; + } else if (s->subsampling[0] == 4 && s->subsampling[1] == 1) { + s->avctx->pix_fmt = AV_PIX_FMT_YUV411P; } else if (s->subsampling[0] == 2 && s->subsampling[1] == 2) { s->avctx->pix_fmt = AV_PIX_FMT_YUV420P; } else {