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 E472649823 for ; Wed, 19 Jun 2024 18:24:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 755C168D84E; Wed, 19 Jun 2024 21:24:31 +0300 (EEST) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6E4468D847 for ; Wed, 19 Jun 2024 21:24:24 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1f4c7b022f8so458855ad.1 for ; Wed, 19 Jun 2024 11:24:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718821462; x=1719426262; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dAu3mUVWyvVHfynd5YkoxnAvKQwG+vfz6NhDU9y3RnA=; b=YGcz6IaMwDSz9yQFcRQ/pwPKahHqq8zlDaunM8rJVeJ7rzvte7IbXbuSkcRuNhhhKF knrlzDzDeabBQeAw6H/lFv8Hu8qkMWGpg632kQd3Ry3iEs81XDbVGD43g4rMWRGQXot3 mB4kfvVuf/9XDGRqNLPwlXb522hYzsV2KNVwI1bZuH7N5uigyZVD12o6GYmuUXyWFI0S f3x91b8FuKfuoaqX0ZHeOgT/NzwXBMEiMN8BiCe4/of3PgNe7H07a848ANgQl5uDAiRI amzadA8ao5RUX1caiFb5NFD5g2W5E1tCp1sKsgDV8wGL2UuDrSrzM5CskF/vW+s5pVGO mG9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718821462; x=1719426262; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dAu3mUVWyvVHfynd5YkoxnAvKQwG+vfz6NhDU9y3RnA=; b=tCpYP6xJZly4ruOKPjUbicQEw6703YmXuJ6o6cih3/40wP4BsYbn01o0e1rxbkw8Xu mfNEJEqJTfGbDPBSS9wwHRdlOQV75eyI9QiXGGaOVzX73SI3ciJOFUOChVQ8Umo+XAmQ IIrlX30RMcJRA+5L610JShLAF4dXRyRXDesclTdMp8UqZq0Lkos23ljmUqyL5QANZy3E ctkjPHCVaxZz9zWQetJ94l8BYI/um6p4ufBgJSYeAUse3D/KWWTpEnXVzG9TyP+bxVHX If+ux2k3TQyRoc5KnTnzd9oeD00W6SS+a9jNqDQXyBz+vWiT6nOjKxmUcZMfPoSNxci8 OTAw== X-Gm-Message-State: AOJu0YyyJe3GVgysXnpiIoo4J3ey18Jee63DMEmOsrnrJuuPd9/JyRIm nkbzyb3v7wvOT7K/hBOOo+H2xhwwNABcSUYvr63acwUwTkZzau638U514A== X-Google-Smtp-Source: AGHT+IGb4aSgEWEMGgtg5BR57U7CAl8xVnj7wbz5ec+hKqx3JYnbeoq+xHoYFK1U40jIvV7sJM9e+Q== X-Received: by 2002:a17:902:cece:b0:1f7:3d44:1f1c with SMTP id d9443c01a7336-1f9aa3bc92emr36493195ad.5.1718821462113; Wed, 19 Jun 2024 11:24:22 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855ee6e7esm120363405ad.139.2024.06.19.11.24.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 11:24:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jun 2024 15:24:12 -0300 Message-ID: <20240619182413.3247-2-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240619182413.3247-1-jamrial@gmail.com> References: <20240619182413.3247-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mov: don't use sizeof(AVMasteringDisplayMetadata) 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 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: It's not part of the libavutil ABI. Signed-off-by: James Almer --- libavformat/isom.h | 1 + libavformat/mov.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index c0a5788e08..35b767a52c 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -250,6 +250,7 @@ typedef struct MOVStreamContext { AVSphericalMapping *spherical; size_t spherical_size; AVMasteringDisplayMetadata *mastering; + size_t mastering_size; AVContentLightMetadata *coll; size_t coll_size; AVAmbientViewingEnvironment *ambient; diff --git a/libavformat/mov.c b/libavformat/mov.c index 367af8478b..2d5b24b9a9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6138,7 +6138,7 @@ static int mov_read_smdm(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_skip(pb, 3); /* flags */ - sc->mastering = av_mastering_display_metadata_alloc(); + sc->mastering = av_mastering_display_metadata_alloc_size(&sc->mastering_size); if (!sc->mastering) return AVERROR(ENOMEM); @@ -6181,7 +6181,7 @@ static int mov_read_mdcv(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } - sc->mastering = av_mastering_display_metadata_alloc(); + sc->mastering = av_mastering_display_metadata_alloc_size(&sc->mastering_size); if (!sc->mastering) return AVERROR(ENOMEM); @@ -10043,7 +10043,7 @@ static int mov_read_header(AVFormatContext *s) if (sc->mastering) { if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, - (uint8_t *)sc->mastering, sizeof(*sc->mastering), 0)) + (uint8_t *)sc->mastering, sc->mastering_size, 0)) return AVERROR(ENOMEM); sc->mastering = NULL; -- 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".