aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-07-20 22:54:35 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-08-04 12:57:38 +0100
commitbcc5f69b33e27b5e11aaea8304ee02f8d895cdab (patch)
treeafc4aa29d7e8e246837bafa297bd46eb542625ae /libavcodec
parente64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe (diff)
downloadffmpeg-bcc5f69b33e27b5e11aaea8304ee02f8d895cdab.tar.gz
tiff: support reading gray+alpha at 16 bits
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/tiff.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 6afc2cbc96..7341b3fb33 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -262,6 +262,9 @@ static int init_image(TiffContext *s, AVFrame *frame)
case 161:
s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GRAY16LE : AV_PIX_FMT_GRAY16BE;
break;
+ case 322:
+ s->avctx->pix_fmt = s->le ? AV_PIX_FMT_YA16LE : AV_PIX_FMT_YA16BE;
+ break;
case 324:
s->avctx->pix_fmt = AV_PIX_FMT_RGBA;
break;