[FFmpeg-cvslog] avcodec/tiff: Support 410 and 440 YCbCr

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 30 17:41:31 2014 +0200| [1e25afc1811a279094ebc2bc6407715a439e09ee] | committer: Michael Niedermayer

avcodec/tiff: Support 410 and 440 YCbCr

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e25afc1811a279094ebc2bc6407715a439e09ee
---

 libavcodec/tiff.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 4d20b1c..1caad84 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -594,8 +594,12 @@ static int init_image(TiffContext *s, ThreadFrame *frame)
                 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] == 1 && s->subsampling[1] == 2) {
+                s->avctx->pix_fmt = AV_PIX_FMT_YUV440P;
             } else if (s->subsampling[0] == 2 && s->subsampling[1] == 2) {
                 s->avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+            } else if (s->subsampling[0] == 4 && s->subsampling[1] == 4) {
+                s->avctx->pix_fmt = AV_PIX_FMT_YUV410P;
             } else {
                 av_log(s->avctx, AV_LOG_ERROR, "Unsupported YCbCr subsampling\n");
                 return AVERROR_PATCHWELCOME;