This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 80f14b251b54d259b18b0ba55ca06d23da2c20f0 Author: Timo Rothenpieler <[email protected]> AuthorDate: Mon Jul 27 16:00:10 2026 +0200 Commit: Timo Rothenpieler <[email protected]> CommitDate: Mon Jul 27 20:32:34 2026 +0200 Revert "lavfi: do not send premultiplied alpha to filters not ready for it" This reverts commit f3431169daab3f1ca26638de6d4f6fca0f090c15, which introduced various regressions and hangs with at least exr, as reported by fate, and potentially other codecs that are not as thouroughly tested. --- libavfilter/formats.c | 15 +-------------- libavfilter/formats.h | 12 ------------ 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 2076beda0d..7644fc4c75 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -722,14 +722,6 @@ AVFilterFormats *ff_all_color_ranges(void) return ret; } -AVFilterFormats *ff_alpha_mode_straight(void) -{ - AVFilterFormats *ret = NULL; - if (ff_add_format(&ret, AVALPHA_MODE_STRAIGHT) < 0) - return NULL; - return ret; -} - AVFilterFormats *ff_all_alpha_modes(void) { AVFilterFormats *ret = NULL; @@ -959,11 +951,6 @@ int ff_set_common_alpha_modes_from_list(AVFilterContext *ctx, return ff_set_common_alpha_modes(ctx, ff_make_format_list(alpha_modes)); } -int ff_set_common_alpha_mode_straight(AVFilterContext *ctx) -{ - return ff_set_common_alpha_modes(ctx, ff_alpha_mode_straight()); -} - int ff_set_common_all_alpha_modes(AVFilterContext *ctx) { return ff_set_common_alpha_modes(ctx, ff_all_alpha_modes()); @@ -1228,7 +1215,7 @@ int ff_default_query_formats(AVFilterContext *ctx) ret = ff_set_common_all_color_ranges(ctx); if (ret < 0) return ret; - ret = ff_set_common_alpha_mode_straight(ctx); + ret = ff_set_common_all_alpha_modes(ctx); if (ret < 0) return ret; } diff --git a/libavfilter/formats.h b/libavfilter/formats.h index cde86a40b1..45864a32db 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -144,12 +144,6 @@ AVFilterFormats *ff_all_color_spaces(void); av_warn_unused_result AVFilterFormats *ff_all_color_ranges(void); -/** - * Construct an AVFilterFormats with only premultiplied alpha. - */ -av_warn_unused_result -AVFilterFormats *ff_alpha_mode_straight(void); - /** * Construct an AVFilterFormats representing all possible alpha modes. */ @@ -233,12 +227,6 @@ av_warn_unused_result int ff_set_common_alpha_modes_from_list(AVFilterContext *ctx, const int *alpha_modes); -/** - * Equivalent to ff_set_common_alpha_modes(ctx, ff_alpha_mode_straight()) - */ -av_warn_unused_result -int ff_set_common_alpha_mode_straight(AVFilterContext *ctx); - /** * Equivalent to ff_set_common_alpha_modes(ctx, ff_all_alpha_modes()) */ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
