ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Aug 19 21:08:34 2014 +0200| [f0c0ae37c66913c8a26ab25718c22f105dd28b82] | committer: Michael Niedermayer
avcodec/tiff: Check that pix_fmt is a yuv variant for TIFF_PHOTOMETRIC_YCBCR Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0c0ae37c66913c8a26ab25718c22f105dd28b82 --- libavcodec/tiff.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 61387e7..d5c03e8 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -643,6 +643,15 @@ static int init_image(TiffContext *s, ThreadFrame *frame) s->bpp, s->bppcount); return AVERROR_INVALIDDATA; } + + if (s->photometric == TIFF_PHOTOMETRIC_YCBCR) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->avctx->pix_fmt); + if((desc->flags & AV_PIX_FMT_FLAG_RGB) || desc->nb_components < 3) { + av_log(s->avctx, AV_LOG_ERROR, "Unsupported YCbCr variant\n"); + return AVERROR_INVALIDDATA; + } + } + if (s->width != s->avctx->width || s->height != s->avctx->height) { ret = ff_set_dimensions(s->avctx, s->width, s->height); if (ret < 0) _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
