From: Niklas Haas <ffmpeg@haasn.xyz>
To: ffmpeg-devel@ffmpeg.org
Cc: Niklas Haas <git@haasn.dev>
Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/decode: use ff_icc_profile_sanitize
Date: Wed, 27 Sep 2023 12:03:56 +0200
Message-ID: <20230927100630.50510-6-ffmpeg@haasn.xyz> (raw)
In-Reply-To: <20230927100630.50510-1-ffmpeg@haasn.xyz>
From: Niklas Haas <git@haasn.dev>
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);
--
2.42.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2023-09-27 10:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 10:03 [FFmpeg-devel] [PATCH 0/5] work around broken (apple) ICCv4 profiles Niklas Haas
2023-09-27 10:03 ` [FFmpeg-devel] [PATCH 1/5] avutil/rational: add av_abs_q Niklas Haas
2023-09-27 10:14 ` Anton Khirnov
2023-09-27 10:22 ` Andreas Rheinhardt
2023-09-27 10:03 ` [FFmpeg-devel] [PATCH 2/5] avutil/csp: re-use av_abs_q Niklas Haas
2023-09-27 10:03 ` [FFmpeg-devel] [PATCH 3/5] avcodec/fflcms2: add ff_icc_profile_sanitize Niklas Haas
2023-09-27 10:20 ` Andreas Rheinhardt
2023-09-27 10:26 ` Niklas Haas
2023-09-27 10:03 ` [FFmpeg-devel] [PATCH 4/5] avfilter/vf_iccdetect: use ff_icc_profile_sanitize Niklas Haas
2023-09-27 10:03 ` Niklas Haas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230927100630.50510-6-ffmpeg@haasn.xyz \
--to=ffmpeg@haasn.xyz \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=git@haasn.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git