diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-30 19:01:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-30 19:01:56 +0100 |
| commit | dffc16d52314992123b22149fc03eb0ca76d1e54 (patch) | |
| tree | 0e0f7e4aca80e3c4aaf079ccff34e17d8b598b7c /libavcodec | |
| parent | 9fd925dee58d6af846f5ff4f63f5052ec4075581 (diff) | |
| parent | 50144b91ea50757c57c94a3927bf14a6ffea0de8 (diff) | |
| download | ffmpeg-dffc16d52314992123b22149fc03eb0ca76d1e54.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Respect horizontal differencing predictor for 16bit gray tiff images.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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++) { |