From patchwork Thu Sep 28 15:10:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 43998 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp3350435pzh; Thu, 28 Sep 2023 08:11:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIp0a+zUQvITrYJgh+MHZenWK5wZmkd5dNSAOL3ia3dX1SbWGWxM3YjtXBALNMuojJU8Qz X-Received: by 2002:a05:6402:d2:b0:523:3f1e:68c4 with SMTP id i18-20020a05640200d200b005233f1e68c4mr1571379edu.34.1695913875247; Thu, 28 Sep 2023 08:11:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695913875; cv=none; d=google.com; s=arc-20160816; b=Wcb4VaoJlX2oAR1vPEoUuo01/GU+C3ZZlygyVY+YQqjgx1g1pghc5VSSQOWyunpPkj 2eVXkoD0pBf4CeRlG19eG5wIj/V2Ka5CzOZwyA9RanklSz3+Z3OSkGDYj0RqDCff9pBY 769lrjH9xSARuIuHOW3N6rJdIzLTzLpdBxV7vaMW1rVaMxUpRFEJBkPuMb+QFZxNLJZc FE1mjVLBtelC2YdvYiCTdH46cZ8M+hDxhA29G45PXj5T4S9yMtse9avfJJ1PExEfd5bI 2KE/K5PRRe9vEO3qpi77y0sB5IgA1xKYXp5dZjMYW+V3kUMZ/CFlRDDzx+U3xnSGdAR8 dPtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=qCATyj8GcQ+HFjZFrvfWNcRxUYxwlaiv53EfPNrEwik=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=vVPZORxVauyF5xUeR/SP7u7I0UzHsFY7yY8lbS04awbgo3GizeBgBJguv1CcwvasSV xEcPIYRRdj0k7KkuW3F8xxb10tlW/NEcm1VfTXzw317xCRSE8nxLkd7ny4/DSmREMZ1z WCaLkLddJhKvOxMuzpJWMgSkEJqUOVLsfuEBv4vkt9dUyUfPZWFKAH4EXkkhAE9Yq2HG HLwveMNOILtBhs5d5FYTPYYVXm49tOdY6d+tOcRWBtlqs6FJXQTu+acMtFDobf1T0Slu 8cl9gKTMdi/CposRsl+j00qQWKaoxE2oLSdcpwpy8jQGtMWYc50VsElnd3NrPtMl8bor gRXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b="mPtE8C/z"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d19-20020a05640208d300b005329f1aa075si4247576edz.211.2023.09.28.08.11.05; Thu, 28 Sep 2023 08:11:15 -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=@haasn.xyz header.s=mail header.b="mPtE8C/z"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BDF4968CB7F; Thu, 28 Sep 2023 18:10:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D8BB268C9EE for ; Thu, 28 Sep 2023 18:10:44 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 99D3B43600; Thu, 28 Sep 2023 17:10:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1695913844; bh=xYGIxu1nb9iUxBrPDglbb37NKRlHV8Cub7Wf/fge4oY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mPtE8C/zwUe2dLukaEs27PukjVXKxSE5hVhT5e/AvI+p3DZgfI6YX3Y2YrCNLpPo3 RwqvhY3W4pfzs2QptzdtIvDfH3plf+Y0maUNTy1TbGwdsOyRBCvBG5v1AIab7cJQmq LG8uXnTbHJq1dI4tch3yw9bEuKOF4O3DZB6dkjos= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 17:10:41 +0200 Message-ID: <20230928151041.57953-3-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230928151041.57953-1-ffmpeg@haasn.xyz> References: <20230928151041.57953-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] avcodec/decode: use ff_icc_profile_sanitize 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rmtlmVDm613D From: Niklas Haas Fixes: https://trac.ffmpeg.org/ticket/9673 --- libavcodec/decode.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 466c393c1e2..6f4ef7da0c2 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -536,7 +536,9 @@ static int detect_colorspace(AVCodecContext *avctx, AVFrame *frame) if (!profile) return AVERROR_INVALIDDATA; - ret = ff_icc_profile_read_primaries(&avci->icc, profile, &coeffs); + ret = ff_icc_profile_sanitize(&avci->icc, profile); + if (!ret) + ret = ff_icc_profile_read_primaries(&avci->icc, profile, &coeffs); if (!ret) ret = ff_icc_profile_detect_transfer(&avci->icc, profile, &trc); cmsCloseProfile(profile);