virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

lavc/tiff: Don't apply strips-related logic to tiled images

Browse Source 
Signed-off-by: Nick Renieris <velocityra@gmail.com>
This commit is contained in:
Nick Renieris 2019-08-29 16:10:46 +03:00 committed by Paul B Mahol
parent f98a8666de
commit 33b6752a70
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/tiff.c
View File

@ -1790,7 +1790,7 @@ again:
} }
} }
if (!s->strippos && !s->stripoff) { if (!s->is_tiled && !s->strippos && !s->stripoff) {
av_log(avctx, AV_LOG_ERROR, "Image data is missing\n"); av_log(avctx, AV_LOG_ERROR, "Image data is missing\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -1798,6 +1798,7 @@ again:
if ((ret = init_image(s, &frame)) < 0) if ((ret = init_image(s, &frame)) < 0)
return ret; return ret;
if (!s->is_tiled) {
if (s->strips == 1 && !s->stripsize) { if (s->strips == 1 && !s->stripsize) {
av_log(avctx, AV_LOG_WARNING, "Image data size missing\n"); av_log(avctx, AV_LOG_WARNING, "Image data size missing\n");
s->stripsize = avpkt->size - s->stripoff; s->stripsize = avpkt->size - s->stripoff;
@ -1820,6 +1821,7 @@ again:
av_log(avctx, AV_LOG_ERROR, "rps %d invalid\n", s->rps); av_log(avctx, AV_LOG_ERROR, "rps %d invalid\n", s->rps);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
}
/* Handle DNG images with JPEG-compressed tiles */ /* Handle DNG images with JPEG-compressed tiles */