From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8C8544B97D for ; Tue, 2 Jul 2024 13:44:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 097A968D8EB; Tue, 2 Jul 2024 16:44:39 +0300 (EEST) Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00F1568D8AE for ; Tue, 2 Jul 2024 16:44:28 +0300 (EEST) Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-64a4a3e0869so1010287b3.3 for ; Tue, 02 Jul 2024 06:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719927867; x=1720532667; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E8v/O8LpM8h9ny9GBt87yUd9A0ABGtpWnhtQUXUL3m0=; b=lP/oNa1C458YDB+7L39eTy+v5NOlWWIlV/J5PMr5Ft4/740HJ/hmPw+r9bdTAZNbnn TD7qwbsdt6UNb3+4exe5lA86S6ckp9AR++bRY+tgzeWFarxbrrM/cpTtYdkCS+jeRN5x rb96s0gDlllIge5Yb5+RvzCwzU3iYoIyor70fxotp5/zvItVk1c7WZcKF6/sElBei0Ll UyGlhPWKkdetc2emB60rp+lueH9KTmHE5V1Ge/3BA7Xs/6N+Zup+jjsfocF4fkuFUc8E 8u506uq5M1M6CLjTT+0zJkRT312hxOv7qlUpc/+YTqmgqxcXrUQnIA7Zcmg8Q3bu8dS9 IW1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927867; x=1720532667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E8v/O8LpM8h9ny9GBt87yUd9A0ABGtpWnhtQUXUL3m0=; b=nmWgIqHyIZD2YVeJ8ir3wQ0+ERQvDRSFrugHYRopzy2XJ5QIBD4/Yy70MPO4G6Lm7/ gU+hmBZ+oAXJIGEjfHGGZXXyEBd/K+RsJPydr5ONLWrax/LJXfq5SruHeQAytw8MFHu9 Jp0UOknEqMbS5xyi+0XCMyWKREYMHMCS9AMmv3gFwGEeJtF/0bZDett6ex4AwNGgtuzU /MS0oBbfyrHbim29DvhkY6ujRJaxHySwZ5dw/dWF9OJ0nr2GDg+1ts07XEZZ3mnyDfVl EvpLVyJwf6MjVIWyxk+zCYIL+mCFLoeS4MYmkpJernoMrc3RxpHhn+S92u+HseIjsQ+H z43Q== X-Gm-Message-State: AOJu0Yxtpb7JrKadAOJsFUW1vXTloAmZ3p9+0sZxfftswBya0nXn3EUo CE+dksEE2XohAfm6c+OK4z5gatQKWeK7KBLp0xCzEZIk3wuzxT9WpnMVLQ== X-Google-Smtp-Source: AGHT+IEUVoEA8fRARu0qzr4x9XBBCLobZdFqcQlZyWVq7anr2Qx47Zg3rO+xoKiekxD3lUlRYjtuEA== X-Received: by 2002:a81:91cd:0:b0:627:a25d:6e76 with SMTP id 00721157ae682-64c71802f38mr59017397b3.2.1719927867439; Tue, 02 Jul 2024 06:44:27 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id 00721157ae682-64a9c40907csm17540187b3.139.2024.07.02.06.44.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 06:44:27 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jul 2024 09:44:24 -0400 Message-ID: <20240702134424.133688-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702134424.133688-1-leo.izen@gmail.com> References: <20240702134424.133688-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/pngenc: fix mDCv typo 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: Ramiro Polla , Leo Izen Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: When mDCv support was added, there was a typo in both variable names and also the MKTAG itself, incorrectly listing it as mDVc. The tag name stands for Mastering Display Color Volume so mDCv is correct. Typo originally introduced in 78949041417caaef0c82b2b23d7defdd88aa2378. Signed-off-by: Leo Izen Reported-by: Ramiro Polla --- libavcodec/pngenc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 89c3d5b83e..7ae16fa2c5 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -450,17 +450,17 @@ static int encode_headers(AVCodecContext *avctx, const AVFrame *pict) side_data = av_frame_get_side_data(pict, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); if (side_data) { - AVMasteringDisplayMetadata *mdvc = (AVMasteringDisplayMetadata *) side_data->data; - if (mdvc->has_luminance && mdvc->has_primaries) { + AVMasteringDisplayMetadata *mdcv = (AVMasteringDisplayMetadata *) side_data->data; + if (mdcv->has_luminance && mdcv->has_primaries) { for (int i = 0; i < 3; i++) { - AV_WB16(s->buf + 2*i, PNG_Q2D(mdvc->display_primaries[i][0], 50000)); - AV_WB16(s->buf + 2*i + 2, PNG_Q2D(mdvc->display_primaries[i][1], 50000)); + AV_WB16(s->buf + 2*i, PNG_Q2D(mdcv->display_primaries[i][0], 50000)); + AV_WB16(s->buf + 2*i + 2, PNG_Q2D(mdcv->display_primaries[i][1], 50000)); } - AV_WB16(s->buf + 12, PNG_Q2D(mdvc->white_point[0], 50000)); - AV_WB16(s->buf + 14, PNG_Q2D(mdvc->white_point[1], 50000)); - AV_WB32(s->buf + 16, PNG_Q2D(mdvc->max_luminance, 10000)); - AV_WB32(s->buf + 20, PNG_Q2D(mdvc->min_luminance, 10000)); - png_write_chunk(&s->bytestream, MKTAG('m', 'D', 'V', 'c'), s->buf, 24); + AV_WB16(s->buf + 12, PNG_Q2D(mdcv->white_point[0], 50000)); + AV_WB16(s->buf + 14, PNG_Q2D(mdcv->white_point[1], 50000)); + AV_WB32(s->buf + 16, PNG_Q2D(mdcv->max_luminance, 10000)); + AV_WB32(s->buf + 20, PNG_Q2D(mdcv->min_luminance, 10000)); + png_write_chunk(&s->bytestream, MKTAG('m', 'D', 'C', 'v'), s->buf, 24); } } -- 2.45.2 _______________________________________________ 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".