diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-01-30 14:12:55 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-01-30 14:12:55 +0100 |
| commit | 50144b91ea50757c57c94a3927bf14a6ffea0de8 (patch) | |
| tree | 1d5fd5e0bdc943e512727bafc36e6012b20a9418 | |
| parent | 40b026b1d0a33684ec28fd7db03e250671babefa (diff) | |
| download | ffmpeg-50144b91ea50757c57c94a3927bf14a6ffea0de8.tar.gz | |
Respect horizontal differencing predictor for 16bit gray tiff images.
Fixes ticket #4291.
| -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 8047f384ef..4fe1168774 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1293,6 +1293,8 @@ static int decode_frame(AVCodecContext *avctx, ssize = s->width * soff; if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE || s->avctx->pix_fmt == AV_PIX_FMT_RGBA64LE || + s->avctx->pix_fmt == AV_PIX_FMT_GRAY16LE || + s->avctx->pix_fmt == AV_PIX_FMT_YA16LE || s->avctx->pix_fmt == AV_PIX_FMT_GBRP16LE || s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16LE) { for (i = 0; i < s->height; i++) { @@ -1302,6 +1304,8 @@ static int decode_frame(AVCodecContext *avctx, } } else if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48BE || s->avctx->pix_fmt == AV_PIX_FMT_RGBA64BE || + s->avctx->pix_fmt == AV_PIX_FMT_GRAY16BE || + s->avctx->pix_fmt == AV_PIX_FMT_YA16BE || s->avctx->pix_fmt == AV_PIX_FMT_GBRP16BE || s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16BE) { for (i = 0; i < s->height; i++) { |