From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 882654DF2C for ; Thu, 8 Jan 2026 13:19:19 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'd5kw3i25ty8a/zvHoTzqNS7kkHPt8FV75QLkK6g1eNM=', expected b'u4rSB1SdE3lZAqwhyPqFRCJ7fKLoZhGxq75qA1XFcjM=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767878340; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=d5kw3i25ty8a/zvHoTzqNS7kkHPt8FV75QLkK6g1eNM=; b=rB9T1Vi7GXEDADmwdUH/cWcLb7YzDe+68HVbFSYbdSqSVoBOe+NHNOCnCivPNlFVRy6Og YFDFYuQf0CqaDf1ze7mZ0W5JhBgWJiAOlGf9ghDurWMYAvNgtFoWWPbXa+o2uw/xqfqcCXW 1HfVDMw0XyaQYOv/DPygslvP1Ev60+Reuz5ieLDtcazow4oKlJMDCwxpydksolbWehFBWv0 BKpbUbkZPT8/XZtwKkiAbEIZMJbRFPsNiklEUzwwF4ZN6zCXhKlxiVmwfKsx9TSvyQ4w8H0 xlLowKD0usrJ/OyigaCXdQu+6969n3eVgRBLrWqk2/x4vrjqCPQG3akMBXpQ== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A8A12690D6C; Thu, 8 Jan 2026 15:19:00 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1767878324; b=HTNMlPmoheyN9zXifZs5SYiLlzNo10+cNKSh3yIaDJaZkvSrfK5qQsTx0Kjc9QjCbwsea Q5y2iwhlesdbl9oGJ228pFIx4vutpeMPhKpOKFUWtJCAyTuR9FlSV6UZh8D3ceWYDNKpeJ6 9EmHIK33bTzbN+tlpe1zUz5ZdHQymaXudbm4EfEK4eOkQpixqPA8xu8HEp4bj040j5rw2jx 6Y2iyM8jDFxHM8NLPu8Ya3TOyCwCcfrUuGH6PezPcvN4ZeapNdC4urR0XPDNjb2SCCKGaiM 5tX4bUl5BA0Z365YB0txgyXrgAj0AbVUa2VQC7CH1wRK0/OTWeeuhPqfvLLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1767878324; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=HdxywO1tV7LbJnq2q0TilQD8EqVX7p7a7Gs66KxLD+w=; b=Tv9Un3Obvjl1jceeI1EdmWdxIkrjK13W+iOjycouoNtGbh23IDpJW0tb0YgA4AuiKSp1B tjI8/brHpp79plVhoyQp01CGM2R+hUec1HdxlD0/qIzxpfXjk0ZNetsiUtFlvqce74Z0zPA n+wa8P69UFiZj2i1uksxf2xLJbWcKBtG4FhrU3hCkkr9eoFA/DSxl/8eCyh68y6Fi0vmDAY yctzpFHqIlMTsggiRXzf7J/fspLUnMhhtFaKfouosJoppuoz9IzypjDCBWy9E4I6cULupog SYFLwYvIHJ7VH5oElSVC3RN112/sHu2AI5ilvX8XP/VIJis1BBraue4WuWSA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767878316; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=u4rSB1SdE3lZAqwhyPqFRCJ7fKLoZhGxq75qA1XFcjM=; b=l4tBQu4PZTW/qzlfNgDqpSpsXA5xapOPOleGI3BC9u+X16ooIb+cmkxFgZ2vbKVpqqSxs gJ0R2Ituhncu9fXHiCjT1btojWLReJ5PVfdQRxWNTUTcxsgr9SMLfXFI1OM8te6GGVrZBDc pGr1U+AdkzHo+DuC5/jrf4QsgklMrsuL8t7jFzMpWgfycFsWGcYG/PFKN1Rw7anlrAFCKxl TTDxNluv9OwBHoNiy34RI2acc003VMgSXsArD5e0ndR0qLEGyPOTC/SjKuNSYnOkg8ybuAn zTnl0YirAP4+WIBIEXmAlliDB8//rip8rVhnjhVo7qyJU6q14EE7AsHSnEYA== Received: from de3a2b3407a2 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 71B4A690D3E for ; Thu, 8 Jan 2026 15:18:36 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Thu, 08 Jan 2026 13:18:36 -0000 Message-ID: <176787831660.25.262851550221476233@4457048688e7> Message-ID-Hash: SH27ERSMPW7EWZSJU6RBD2CVEXJBPWNR X-Message-ID-Hash: SH27ERSMPW7EWZSJU6RBD2CVEXJBPWNR X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PR] avfilter/formats: Add set_list function for enum AVSampleFormat and enum AVPixelFormat to avoid breaking ABI by converting int* and enum* (PR #21411) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: nyh163925 via ffmpeg-devel Cc: nyh163925 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21411 opened by nyh163925 URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21411 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21411.patch We provide a more secure API for setting cfg in link, which avoid breaking ABI caused by int* and enum* . #https://code.ffmpeg.org/FFmpeg/FFmpeg/issues/21289 Signed-off-by: niyinghao >>From 748064f406fa9390a14605da671e17d48e27756c Mon Sep 17 00:00:00 2001 From: niyinghao Date: Thu, 8 Jan 2026 20:44:48 +0800 Subject: [PATCH] avfilter/formats: Add set_list function for enum AVSampleFormat and enum AVPixelFormat to avoid breaking ABI by converting int* and enum* Signed-off-by: niyinghao --- libavfilter/formats.c | 43 +++++++++++++++++++++++++++++++++++------- libavfilter/formats.h | 44 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 7 deletions(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 5ba961f059..e9b36747e1 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -497,14 +497,18 @@ int ff_fmt_is_in(int fmt, const int *fmts) } \ } -AVFilterFormats *ff_make_format_list(const int *fmts) -{ - MAKE_FORMAT_LIST(AVFilterFormats, formats, nb_formats); - while (count--) - formats->formats[count] = fmts[count]; +#define MAKE_FORMAT_LIST_TYPE(name, type) \ + AVFilterFormats *ff_make_ ## name ## _list(const type* fmts) \ + { \ + MAKE_FORMAT_LIST(AVFilterFormats, formats, nb_formats); \ + while (count--) \ + formats->formats[count] = (int)fmts[count]; \ + return formats; \ + } - return formats; -} +MAKE_FORMAT_LIST_TYPE(format, int) +MAKE_FORMAT_LIST_TYPE(sample_formats, enum AVSampleFormat) +MAKE_FORMAT_LIST_TYPE(pixel_formats, enum AVPixelFormat) AVFilterChannelLayouts *ff_make_channel_layout_list(const AVChannelLayout *fmts) { @@ -969,6 +973,16 @@ int ff_set_common_formats_from_list(AVFilterContext *ctx, const int *fmts) return ff_set_common_formats(ctx, ff_make_format_list(fmts)); } +int ff_set_sample_formats_from_list(AVFilterContext *ctx, const enum AVSampleFormat *fmts) +{ + return ff_set_common_formats(ctx, ff_make_sample_formats_list(fmts)); +} + +int ff_set_pixel_formats_from_list(AVFilterContext *ctx, const enum AVPixelFormat *fmts) +{ + return ff_set_common_formats(ctx, ff_make_pixel_formats_list(fmts)); +} + #define SET_COMMON_FORMATS2(ctx, cfg_in, cfg_out, fmts, media_type, \ ref_fn, unref_fn) \ if (!fmts) \ @@ -1139,6 +1153,21 @@ int ff_set_common_formats_from_list2(const AVFilterContext *ctx, return ff_set_common_formats2(ctx, cfg_in, cfg_out, ff_make_format_list(fmts)); } +int ff_set_sample_formats_from_list2(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out, + const enum AVSampleFormat *fmts) +{ + return ff_set_common_formats2(ctx, cfg_in, cfg_out, ff_make_sample_formats_list(fmts)); +} + +int ff_set_pixel_formats_from_list2(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out, + const enum AVPixelFormat *fmts) +{ + return ff_set_common_formats2(ctx, cfg_in, cfg_out, ff_make_pixel_formats_list(fmts)); +} int ff_default_query_formats(AVFilterContext *ctx) { diff --git a/libavfilter/formats.h b/libavfilter/formats.h index 969bb230f1..e2c527820b 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -248,6 +248,18 @@ int ff_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats); av_warn_unused_result int ff_set_common_formats_from_list(AVFilterContext *ctx, const int *fmts); +/** + * Equivalent to ff_set_common_formats(ctx, ff_make_sample_formats_list(fmts)) + */ +av_warn_unused_result +int ff_set_sample_formats_from_list(AVFilterContext *ctx, const enum AVSampleFormat *fmts); + +/** + * Equivalent to ff_set_common_formats(ctx, ff_make_pixel_formats_list(fmts)) + */ +av_warn_unused_result +int ff_set_pixel_formats_from_list(AVFilterContext *ctx, const enum AVPixelFormat *fmts); + /** * Helpers for query_formats2() which set all free audio links to the same list * of channel layouts/sample rates. If there are no links hooked to this list, @@ -349,6 +361,18 @@ int ff_set_common_formats_from_list2(const AVFilterContext *ctx, AVFilterFormatsConfig **cfg_out, const int *fmts); +av_warn_unused_result +int ff_set_sample_formats_from_list2(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out, + const enum AVSampleFormat *fmts); + +av_warn_unused_result +int ff_set_pixel_formats_from_list2(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out, + const enum AVPixelFormat *fmts); + av_warn_unused_result int ff_add_channel_layout(AVFilterChannelLayouts **l, const AVChannelLayout *channel_layout); @@ -385,6 +409,26 @@ int ff_default_query_formats(AVFilterContext *ctx); av_warn_unused_result AVFilterFormats *ff_make_format_list(const int *fmts); +/** + * Create a list of supported sample formats. This is intended for use in + * AVFilter->query_formats(). + * + * @param fmts list of enum AVSampleFormat, terminated by AV_SAMPLE_FMT_NONE + * @return the format list, with no existing references + */ +av_warn_unused_result +AVFilterFormats *ff_make_sample_format_list(const enum AVSampleFormat *fmts); + +/** + * Create a list of supported formats. This is intended for use in + * AVFilter->query_formats(). + * + * @param fmts list of enum AVPixelFormat, terminated by AV_PIX_FMT_NONE + * @return the format list, with no existing references + */ +av_warn_unused_result +AVFilterFormats *ff_make_pixel_format_list(const enum AVPixelFormat *fmts); + /** * Equivalent to ff_make_format_list({const int[]}{ fmt, -1 }) */ -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org