videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-07 00:20:09 +02:00
Code Releases Activity

avcodec/tiff: do not use photometric to detect pix_fmt

Browse Source 
They should match but they do not always
Fixes assertion failure
no testcase with unmodified source available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-19 20:57:42 +02:00
parent 66d02d3ca6
commit 6ea69a8ffa
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/tiff.c
View File

@ -419,7 +419,8 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid
int c, line, pixels, code, ret;
const uint8_t *ssrc = src;
int width = ((s->width * s->bpp) + 7) >> 3;
int is_yuv = s->photometric == TIFF_PHOTOMETRIC_YCBCR;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(p->format);
int is_yuv = !(desc->flags & AV_PIX_FMT_FLAG_RGB) && desc->nb_components >= 2;
if (s->planar)
width /= s->bppcount;