diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:51:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 22:52:01 +0200 |
| commit | 8f83fb99912fa834ff2081ca876ca05116aab263 (patch) | |
| tree | 0090fffacd3dfcb3c32ebaa32ee7784566b3a417 | |
| parent | 47080b6d17037fd64b3f3a7f19bbad3cdf2d3dac (diff) | |
| parent | 60cbd6ad84de0931314030b81df87b69d6196587 (diff) | |
| download | ffmpeg-8f83fb99912fa834ff2081ca876ca05116aab263.tar.gz | |
Merge commit '60cbd6ad84de0931314030b81df87b69d6196587'
* commit '60cbd6ad84de0931314030b81df87b69d6196587':
tiff: support reading gray+alpha at 8 bits
Conflicts:
libavcodec/tiff.c
See: f746f3790168bf898b629942868bda703e7f1045
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/tiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 5d751628d3..5c9823a657 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -611,7 +611,7 @@ static int init_image(TiffContext *s, ThreadFrame *frame) s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GRAY16LE : AV_PIX_FMT_GRAY16BE; break; case 162: - s->avctx->pix_fmt = AV_PIX_FMT_GRAY8A; + s->avctx->pix_fmt = AV_PIX_FMT_YA8; break; case 322: s->avctx->pix_fmt = s->le ? AV_PIX_FMT_YA16LE : AV_PIX_FMT_YA16BE; |