RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 01:42:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab'

Browse Source 
* commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab':
  tiff: support reading gray+alpha at 16 bits

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-04 22:45:33 +02:00
commit 47080b6d17
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/tiff.c
View File

@ -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;