This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 0629780cf6 avfilter/vf_libplacebo: replace preproc directive in
function-like macros
0629780cf6 is described below
commit 0629780cf63b4fde5f2df643dc3cd278b9778bfd
Author: nikitalita <[email protected]>
AuthorDate: Sat Dec 27 07:44:23 2025 -0800
Commit: Niklas Haas <[email protected]>
CommitDate: Sat Dec 27 18:13:13 2025 +0000
avfilter/vf_libplacebo: replace preproc directive in function-like macros
MSVC build was failing due to preprocessor directives being used within
function-like macro argument lists, which is undefined behavior according to
the C11 spec. Fixed by replacing the directive blocks with macro definitions
outside of the macro invocations.
---
libavfilter/vf_libplacebo.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index c8015a9641..74c1fd7214 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -451,16 +451,18 @@ static int update_settings(AVFilterContext *ctx)
.temperature = (s->temperature - 6500.0) / 3500.0,
};
- opts->peak_detect_params = *pl_peak_detect_params(
+ opts->peak_detect_params = (struct pl_peak_detect_params) {
+ PL_PEAK_DETECT_DEFAULTS
.smoothing_period = s->smoothing,
.scene_threshold_low = s->scene_low,
.scene_threshold_high = s->scene_high,
#if PL_API_VER >= 263
.percentile = s->percentile,
#endif
- );
+ };
- opts->color_map_params = *pl_color_map_params(
+ opts->color_map_params = (struct pl_color_map_params) {
+ PL_COLOR_MAP_DEFAULTS
.tone_mapping_function = get_tonemapping_func(s->tonemapping),
.tone_mapping_param = s->tonemapping_param,
.inverse_tone_mapping = s->inverse_tonemapping,
@@ -469,7 +471,7 @@ static int update_settings(AVFilterContext *ctx)
.contrast_recovery = s->contrast_recovery,
.contrast_smoothness = s->contrast_smoothness,
#endif
- );
+ };
set_gamut_mode(&opts->color_map_params, gamut_mode);
@@ -484,7 +486,8 @@ static int update_settings(AVFilterContext *ctx)
.strength = s->cone_str,
);
- opts->params = *pl_render_params(
+ opts->params = (struct pl_render_params) {
+ PL_RENDER_DEFAULTS
.antiringing_strength = s->antiringing,
.background_transparency = 1.0f - (float) s->fillcolor[3] / UINT8_MAX,
.background_color = {
@@ -513,7 +516,7 @@ static int update_settings(AVFilterContext *ctx)
.disable_builtin_scalers = s->disable_builtin,
.force_dither = s->force_dither,
.disable_fbos = s->disable_fbos,
- );
+ };
RET(find_scaler(ctx, &opts->params.upscaler, s->upscaler, 0));
RET(find_scaler(ctx, &opts->params.downscaler, s->downscaler, 0));
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
