From patchwork Fri Jul 24 18:08:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21251 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7491344AFEC for ; Fri, 24 Jul 2020 21:14:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4BE0868B5DA; Fri, 24 Jul 2020 21:14:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3FF268B4E8 for ; Fri, 24 Jul 2020 21:14:52 +0300 (EEST) Received: by mail-qt1-f196.google.com with SMTP id v22so1632523qtq.8 for ; Fri, 24 Jul 2020 11:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ypw3TS55s5IpnCCYG34HY8yy+yCHMqGOntF5OlXFdMI=; b=p803IebRlHvI9WiNiixP81VEZYRwHE8qX+MPoKKnEr+8+1R/rW88+ORcbXDrSfkdy4 7+zQq2B+bWKHkMyeVQ4rNnSgdhkMARhA0TII19b87TDJAJNeYSRlq1rG0h5h5tLvL55i RX9vE6/JFEOqYbAvF77v1ktsK42HAB1PcSYgVUFkJ0rcldrLN1XjGDb9XO+9hgUzH11H v/5TG2sPx0CRF/AABn/I6hA1RrvG+u7hrbnMIWql+foYBKzQHl7hHm31oLVlAU7rkwF2 JKsLBQZSp8PRzu65uAFk1xi3KRDaAdGdiQ6PKphO2AypFRssYWyjBIVhOypWDkV2pRV/ 8Xjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ypw3TS55s5IpnCCYG34HY8yy+yCHMqGOntF5OlXFdMI=; b=ZIkwwRwZZCut5jmOV/Wfpsb5Cg9d8oyq8CnlvIwYNa2/MoXmMxtueqbySuxOgf+at7 wKHfqk4hj6JJhWjSzh6WpesNiIp1bUlyiq4yX+UzRzj1Xcfq+XXCS+urZlkKIKN7ul3u YuDEOnBv+4mcIqJOGf+yV1CovgwrekoZAQSNMROwmaoI4WFAsbQvH51qQVLc4FMGnYi7 kwNC5JVqSi/IOWWWJf6i5x7VIA8ZAXgOUZAuwxS8Hdm6EYR1fifiQH34dWKqALapLB1R +iO0fx/KBbq7h08j11obmVKW6+LZa6Ae5FSovqQVDnaI0WmglNISBPcG4VOGDbrW3STT +/aQ== X-Gm-Message-State: AOAM531wT+ypbVd4L0t084dsc2bL4z0lq77gCf0yClXF9vKhQDG6uqD0 0WZ8tcQgeWzW+uoU5RzpF/2IXkbZsHo= X-Google-Smtp-Source: ABdhPJyxrD/iKhCUMSbEFUMWSh6yGJq9+I114edPTe7yWHrCDyuExRTGcxOgFWzyYvfkaMeQnz8ofw== X-Received: by 2002:ac8:6602:: with SMTP id c2mr10654842qtp.243.1595614110321; Fri, 24 Jul 2020 11:08:30 -0700 (PDT) Received: from localhost.localdomain ([191.83.211.138]) by smtp.gmail.com with ESMTPSA id 62sm2123841qte.19.2020.07.24.11.08.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 11:08:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jul 2020 15:08:13 -0300 Message-Id: <20200724180813.38042-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/imgutils: don't fill data pointers for missing planes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" The size for a previous plane doesn't signal the presence of another after it. If the plane is present, av_image_fill_plane_sizes() will have returned a size for it. Fixes a regression since 3a8e927176. Reported-by: Imad R. Faiad Signed-off-by: James Almer --- libavutil/imgutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 4096c0da66..e592f7976a 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -167,7 +167,7 @@ int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int hei memset(data , 0, sizeof(data[0])*4); data[0] = ptr; - for (i = 1; i < 4 && sizes[i - 1] > 0; i++) + for (i = 1; i < 4 && sizes[i]; i++) data[i] = data[i - 1] + sizes[i - 1]; return ret;