From patchwork Wed Aug 31 17:48:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 37578 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp496575pzh; Wed, 31 Aug 2022 10:48:41 -0700 (PDT) X-Google-Smtp-Source: AA6agR6lUyAygd2gjsEcWEqPH5kSAyZgweN29VoMNAFURt4XFeZRfRzXtsrAs9fc8PPgjRI4bkzw X-Received: by 2002:a05:6402:1d54:b0:447:b1f7:9ecf with SMTP id dz20-20020a0564021d5400b00447b1f79ecfmr25104552edb.425.1661968121307; Wed, 31 Aug 2022 10:48:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661968121; cv=none; d=google.com; s=arc-20160816; b=E0bEaZ4Nm1sc6wqh5MNoeGH/aLDBhuf197sl/I0ZXq8NCDHYePCfGrvYPYQqB2z+Et vG+30nWAecPXInBrFfkalh7x6PfT/EHA3FgCC0tZVMefcHeAhu+WQNFgW/cj2HBpyv3u C41WXJT5aXQ21c/TPYc8VfDR5KIpN3WvhB3qpG/LspAdYhjp/Gfbkp6CeucZbSMA0tTH Tp1HOFj/i38ksPS8eZPXXbG1vepzrIW8f4SuouskbFab7DPdd54hOgmf/l2PClS4yFLK S5VsjnzWYkEA4XlVC1zdrC+T6g//JD0DTYv4B8GiNs5SlyAeXjWaEX9PlayzrfHlvSPy uL7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=X33sYUObZ97Pb+1B5hVyN0wnU9ngR/kj9CsmzyR20xw=; b=ZzSLJAuyyyCsPN02ule8g++426bppPeYgOMXR0SkaNP6eua3vQSfUQ6+wJ/OdmNWTf +aenhu4l9NkX1S2hO6lT9se3lcgEgx7wCPXrocXYmkTUgg0X2DlsqlsEwkrk5we5wfWV fOcpkjTGxaUp1VNU9FGWrFfNe+DkO91FIlTT0szb2rMBHqJB5H8Pip3bxC2UQibu0hVE JXjqW624zJjJCPOGicFun/v63e9NtxeeUtr9KIIXFxO7Lv++2/BXZAfFHvZQUoFs13HD o0DXbThc1WZuAe9fD7WfJu8J8yRsZ7Oa2jEG8S70+SHM2vG5fuSdHk6LZFAZOPNeXHpW uGCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=j7+LYt+d; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id tl24-20020a170907c31800b0073d8cfa8070si7949292ejc.271.2022.08.31.10.48.40; Wed, 31 Aug 2022 10:48:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=j7+LYt+d; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B437F68B959; Wed, 31 Aug 2022 20:48:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0FB068B959 for ; Wed, 31 Aug 2022 20:48:29 +0300 (EEST) Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-33dc345ad78so314546167b3.3 for ; Wed, 31 Aug 2022 10:48:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc; bh=A/ZHVt/ArMqwoJ1KCMbtd/xgf/XOwxQS6KEbof6xOn0=; b=j7+LYt+dTeMBGliLLItm6G5b2nYqD2ts23Fl+PCSzvVo+yNcfmQBaa0xcxeti4tkPB GkMLWXxXbaBv4jX3rGjRjdhSFpJgovTFTvNZlkj8O5ZD3PR+vZ4QRQISoQzdipWKSLj7 CokzGMR7EFvHShMXVlT//1tvTE4bkPWeFH2dSSJPlk9g7gVJXIpbYnq7u+2Q8TvErSHk xdGhcI00UFKVbNuUnao2OUPY7qyGZ7vUkACOT2FOw1sh+OIkMqMiwTP4BcCplDEhRg05 5wxBYwwt9+wmRNVxoukw52WCab1U88PiAFx4q1sLI+py2Nf3RRQs8v0ofHi95eT0aKeK hWPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc; bh=A/ZHVt/ArMqwoJ1KCMbtd/xgf/XOwxQS6KEbof6xOn0=; b=4cc8j9s1aM/IBJ/6EOzbaw2tXI81zKgL5HRRAJ70CD5NUvQyocgAguJPrNTWOMvYzG qR/5FhAZxmMZyVzpJzWpgXncOqPNXG62jRIOrgSoPJAypganQEwZu3bhS9KHgCBwcJS2 Ig54v57ANkdUI8bfptbEHSg8Ha2bR/EyRg2mLyauCFBvKe+D4b99hcBMAz3hi0R45ryY p8RR1bRVa33T5nt37C3z9Tn9nd46J6kCWxaWJmC7J6NpoOMHbhOEjJvxKPRyz5jiqAbZ bXwTEyE/craY3MqiMTsMiwcSs4t+UHAqlhUZbP/eSxMG5sQjiHtAJVSwJSAWqbtMjapN nFGg== X-Gm-Message-State: ACgBeo15RIxxhQoQKtfue4ZTOTf1f97kftPT89j4C2qe2EKHZWGUEQtZ aNhdqjJ0c7wnUCchxqBtBCkEfZZPMmxBpooQUD7AQAkq X-Received: by 2002:a81:63d7:0:b0:324:55dc:94f4 with SMTP id x206-20020a8163d7000000b0032455dc94f4mr19137142ywb.388.1661968108327; Wed, 31 Aug 2022 10:48:28 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Wed, 31 Aug 2022 19:48:17 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/tiff: Support multi-component files without RowsPerStrip tag X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rmeRutayl3bq Hi! Attached patch fixes ticket #9514 for me. Please review, Carl Eugen From 98df40635315363bfc248f5c5e94d89bdb261b5b Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 31 Aug 2022 19:37:19 +0200 Subject: [PATCH] lavc/tiff: Support multi-component files without RowsPerStrip tag. Fixes ticket #9514. --- libavcodec/tiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index b0595b56c0..109392ad44 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1367,7 +1367,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) } else s->strippos = off; s->strips = count; - if (s->strips == 1) + if (s->strips == s->bppcount) s->rps = s->height; s->sot = type; break; -- 2.30.1