diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:45:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:45:33 +0200 |
| commit | 47080b6d17037fd64b3f3a7f19bbad3cdf2d3dac (patch) | |
| tree | 179c04cd097a12790d4cd2c5afe3e65b12369f27 /libavcodec/tiff.c | |
| parent | 59412e3a0703222c8bc995a7deb883327b7a9c03 (diff) | |
| parent | bcc5f69b33e27b5e11aaea8304ee02f8d895cdab (diff) | |
| download | ffmpeg-47080b6d17037fd64b3f3a7f19bbad3cdf2d3dac.tar.gz | |
Merge commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab'
* commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab':
tiff: support reading gray+alpha at 16 bits
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 1caad84845..5d751628d3 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -613,6 +613,9 @@ static int init_image(TiffContext *s, ThreadFrame *frame) case 162: s->avctx->pix_fmt = AV_PIX_FMT_GRAY8A; 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; |