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 ESMTPS id 97A534CC9B for ; Sat, 25 Jan 2025 20:24:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EDB8668BA50; Sat, 25 Jan 2025 22:22:26 +0200 (EET) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06AF368B9CC for ; Sat, 25 Jan 2025 22:22:19 +0200 (EET) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21661be2c2dso54979245ad.1 for ; Sat, 25 Jan 2025 12:22:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737836537; x=1738441337; 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=8Hvyptr/23aS2iAuirmhjP3gsBufeZDVEZuL9Aw2C+s=; b=RMH22/EqZE6AbjFvgurNvTWanzYJb6AFd6qYjD++1Yanqq/rmR8SP/Ke8mNvpGzPHj k0lDI2+LL3/9kny8b8EFKkvbamDarS9DNvvN9YRKajEMxS0VsGgYiO77CCV18AF+jHx5 XEes1wIGPjS2PS/S++sBYJiqz2iAD7IHtITDs3pAPtgJHaNMRUJAG1qxaqgqb23jfO7h wvluQ6tUds4xMOuBkyT29y2o42PuRIwb/+qZf4AX+GJNVS6/tzD0fcWZIeXAFWF7yr/e PXFo723U0DZQbB+qlmX9zYbsTJKbfc4L5aA3gyw0FYi1bE9I6vJ6yFC17K4HflJpZK2c YZ/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737836537; x=1738441337; 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=8Hvyptr/23aS2iAuirmhjP3gsBufeZDVEZuL9Aw2C+s=; b=nOK3LCb/cGp7x4h+Z/s/12BqQD6Kyws0BLOX+sC05H+qt4Bkw9Xg2QDuIWwBP1rUtI wmV1We60mFtO8QkndlYFrcYJ4PYPqHNev7oTAW2CjN8QAnDTjQXV+BGqTQWJq7iMQWEL Sulbo6FBQpFb9zasLhIm7GWv701RsHytXjtiNEHtI97YDmND4AqJHx5I4s5ph8+DkTqh zavy+ZyO+feWRS27mgxf+Xrd9TzivAlIoFrD1r9PiEABLJ+ZNXwoXBpqmVTQ4lkbGosC 1WD748bYiYNfpdudx5IU22+fEiYEV56MUyZZxkFyDwZ2W1drm1pxF/6cK+PrjbLJxQ0v rGsA== X-Gm-Message-State: AOJu0YxwjIW3qPAPD1zlyNTY6Gyz4rhVPH1QsB+RTCSgH20LKizQGTvc umRwu+51M+bgbDNOpwcq5xj7N00ue0KqnGRxh200xHsECSNhZhQEZonS/A== X-Gm-Gg: ASbGncs3YHrYdG7fS0Lrv/ySLPETdGf8iiCSV0Scw0InhOgVrAyGTrUO3CKdqMuK9Ah 4dGShBfc4khA6PZ0xGFbA+GXwrcqWXa7IvgmGklye38nJkmpJtWTp3TmDKoA9v9iwLX894BTFx3 Dj6hiDjociEU0QoxHdRUlxCXo2KtaMq/g1056xr2u/D55gPvftF1fbEZD0uY7uA/dxkkacc6sEd KCsCUMkRi47hJKa3lcPqvD+mrHbPAPi0oc1yX/r6C9xeubn1xdqzeKyZq/5EuptvTbgzpeHlAYi UAb8sRMTVZ+3ylbZSUBxOg== X-Google-Smtp-Source: AGHT+IEBthkhJoeXCrl61tiNU5H4hSfrtJy7o4dUeurUZB816M22ngwmUBq1L3iI/B5HrzJ0bnxM6g== X-Received: by 2002:a17:903:2381:b0:21a:8dec:e596 with SMTP id d9443c01a7336-21c355b54e7mr590917935ad.35.1737836537478; Sat, 25 Jan 2025 12:22:17 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:f188:b333:21cc:e83f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da3ea396asm36155335ad.91.2025.01.25.12.22.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jan 2025 12:22:17 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Jan 2025 17:21:41 -0300 Message-ID: <20250125202143.12126-13-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250125202143.12126-1-jamrial@gmail.com> References: <20250125202143.12126-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/14] avutil/mastering_display_metadata: deprecate av_{content_light, mastering_display_metadata}_create_side_data() 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 no longer needed after the addition of av_frame_side_data_new_struct() Signed-off-by: James Almer --- libavutil/mastering_display_metadata.c | 4 ++++ libavutil/mastering_display_metadata.h | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/libavutil/mastering_display_metadata.c b/libavutil/mastering_display_metadata.c index 4948f30523..48d8b04cc8 100644 --- a/libavutil/mastering_display_metadata.c +++ b/libavutil/mastering_display_metadata.c @@ -58,6 +58,7 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *siz return mastering; } +#if FF_API_CREATE_SIDE_DATA AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFrame *frame) { AVFrameSideData *side_data = av_frame_new_side_data(frame, @@ -71,6 +72,7 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFra return (AVMasteringDisplayMetadata *)side_data->data; } +#endif AVContentLightMetadata *av_content_light_metadata_alloc(size_t *size) { @@ -82,6 +84,7 @@ AVContentLightMetadata *av_content_light_metadata_alloc(size_t *size) return metadata; } +#if FF_API_CREATE_SIDE_DATA AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame *frame) { AVFrameSideData *side_data = av_frame_new_side_data(frame, @@ -94,3 +97,4 @@ AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame *fram return (AVContentLightMetadata *)side_data->data; } +#endif diff --git a/libavutil/mastering_display_metadata.h b/libavutil/mastering_display_metadata.h index 52fcef9e37..60ca817eff 100644 --- a/libavutil/mastering_display_metadata.h +++ b/libavutil/mastering_display_metadata.h @@ -21,8 +21,10 @@ #ifndef AVUTIL_MASTERING_DISPLAY_METADATA_H #define AVUTIL_MASTERING_DISPLAY_METADATA_H +#include "attributes.h" #include "frame.h" #include "rational.h" +#include "version.h" /** @@ -86,14 +88,18 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void); */ AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *size); +#if FF_API_CREATE_SIDE_DATA /** * Allocate a complete AVMasteringDisplayMetadata and add it to the frame. * * @param frame The frame which side data is added to. * + * @deprecated use @ref av_frame_side_data_new_struct() * @return The AVMasteringDisplayMetadata structure to be filled by caller. */ +attribute_deprecated AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFrame *frame); +#endif /** * Content light level needed by to transmit HDR over HDMI (CTA-861.3). @@ -125,13 +131,17 @@ typedef struct AVContentLightMetadata { */ AVContentLightMetadata *av_content_light_metadata_alloc(size_t *size); +#if FF_API_CREATE_SIDE_DATA /** * Allocate a complete AVContentLightMetadata and add it to the frame. * * @param frame The frame which side data is added to. * + * @deprecated use @ref av_frame_side_data_new_struct() * @return The AVContentLightMetadata structure to be filled by caller. */ +attribute_deprecated AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame *frame); +#endif #endif /* AVUTIL_MASTERING_DISPLAY_METADATA_H */ -- 2.48.1 _______________________________________________ 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".