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 D03744ACCA for ; Thu, 20 Feb 2025 17:27:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8917E68C625; Thu, 20 Feb 2025 19:25:51 +0200 (EET) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E229D68C5FF for ; Thu, 20 Feb 2025 19:25:40 +0200 (EET) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2fc0d44a876so1954373a91.3 for ; Thu, 20 Feb 2025 09:25:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740072339; x=1740677139; 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=Kyrvr8JoIkxfs9toRKKi/fbKdaPiUZ4/QY1CO6ZGE9+F80vpu940oqhH3joG0XZ/Qt GV/w8v70+gyxUPx9HOIEtK4DzVtXtZXBEEdcnezSBpwceVC0us5CRshEocwtNGzcaOiQ T5GrXFqYQU2gjwRkTx8wCIzGTS3zQGNfNGd7NRiz8t+MywcwRqK89QzLFtjhiULf1+oa MwTVNN3ksJrDq2f8+qTtASslOAUUxukR3Ej+zZabnSJn3ZaiAe+0qYixTjjCERWGMTi6 kRVx8DK0H2GNaC4da6VYPVzuUh33G0tV5Yd99xJgw8Bi7ykGjVAqn+voOQVr4jfWw/4L HB1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740072339; x=1740677139; 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=vv5N67TvDLR1YxyDTdpDVYbAQqmIYkNL6iK8XW7eja2/kimjqOnyB43rk2A/53h7OY O+B0DAw/BHxGfHRfiCVQ9E3RCKw6dneyQ/x/adCLASIzlQwJw6zCR+G8p+fCsg//fmjJ MEuMTaKnnqNgjYZ+rEhuNwp0AZiHBPEwRrxo3Dw7rGiQ+/+/EdkmnjbPmeiLe5JeStWj NQGVuC3ZlrPSE42hFBgqSVLkJGYci2HiEly3Rm08RYgcmYAJVmmKIAy0QQqgB8YQPjlW 32CeVpr9gN1GQaKAoHFmW4nGsdd7r5SiZ5FuT81phlMIXoXjN103FKQrZ6FSUeZ+wa7x BoUQ== X-Gm-Message-State: AOJu0YyPA6VvD9J6oouFbgzCX74FMlciVi+zKFCvnRmrpSMaxSvoaEgy bx4VXfYvVtXFlbAf9lgt2p4PUe2LUWpVEicaRHvCVKSsdpdPtcpm1JOOy9yV X-Gm-Gg: ASbGncvesjm9SMcWt1SVhytsosffY1zSaN7jTZQZXODp3t3QeFiDnje9uRNr78/Si8c Ngeu9HhRiZmDEZRASdkAGCoNguTWho7S6wIYhcP9CpR8xP9m/P/0T+DrzJNxX0rx377RaueY4hR cswrFg7V+GnO+R5G5myFWlgzgdoUeMmVs0pMLEGqZ6qVqYIorG9yUHyyeBP5q1nciF6xW/SBOj1 BmEqMvompMF9xd8M4ocFDDml8KkG0qJIY2pCK2L+I7Wsjs0AvNjTGNAz0GJQvSSlSG2u2QIWZyE 7IDY7Dh975ZmgENSg05l1OQkqaP87Q== X-Google-Smtp-Source: AGHT+IGxkBdIyu1OrXXHIzEIx237mmKnmXjsGlrGeCJS7bNHXV5gfGYBgvaJemWntIPgkBFarhueWA== X-Received: by 2002:a17:90b:1b0d:b0:2fa:2217:531b with SMTP id 98e67ed59e1d1-2fc40f234c9mr32175367a91.21.1740072338799; Thu, 20 Feb 2025 09:25:38 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:84e:2829:1051:10a6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fcb0c5357csm4336202a91.27.2025.02.20.09.25.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 09:25:38 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Feb 2025 14:24:52 -0300 Message-ID: <20250220172454.2952-9-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220172454.2952-1-jamrial@gmail.com> References: <20250220172454.2952-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/11] 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".