diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 18:39:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 18:39:24 +0200 |
| commit | f694ca7ca7a6a7067f612b30e495b7cf4df61a7d (patch) | |
| tree | 48d87fa820f6671f131f23b1572e5462d74911a0 /libavcodec/tiff.c | |
| parent | 217f6c53e5c2d27dbe0d41eaea739c7cc6e5640b (diff) | |
| download | ffmpeg-f694ca7ca7a6a7067f612b30e495b7cf4df61a7d.tar.gz | |
avcodec/tiff: support 4:2:2 and 4:1:1 YCbCr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 { |