Commit 47080b6d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'bcc5f69b'

* commit 'bcc5f69b':
  tiff: support reading gray+alpha at 16 bits

Conflicts:
	libavcodec/tiff.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 59412e3a bcc5f69b
...@@ -613,6 +613,9 @@ static int init_image(TiffContext *s, ThreadFrame *frame) ...@@ -613,6 +613,9 @@ static int init_image(TiffContext *s, ThreadFrame *frame)
case 162: case 162:
s->avctx->pix_fmt = AV_PIX_FMT_GRAY8A; s->avctx->pix_fmt = AV_PIX_FMT_GRAY8A;
break; break;
case 322:
s->avctx->pix_fmt = s->le ? AV_PIX_FMT_YA16LE : AV_PIX_FMT_YA16BE;
break;
case 324: case 324:
s->avctx->pix_fmt = AV_PIX_FMT_RGBA; s->avctx->pix_fmt = AV_PIX_FMT_RGBA;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment