Commit a1fc573823 for ffmpeg
commit a1fc57382394f750d323e1ff9f445b21dc64e702
Author: Niklas Haas <git@haasn.dev>
Date: Fri Oct 30 16:40:54 2026 +0100
avfilter/vf_libplacebo: reorder set_output_props()
Handle Dolby Vision right after copying the frame properties, before the
output link properties. No functional change.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sponsored-by: nxtedition AB
Signed-off-by: Niklas Haas <git@haasn.dev>
diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index dd2bf8f01c..241a1eb462 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -995,14 +995,6 @@ static int set_output_props(LibplaceboContext *s, const AVFilterLink *outlink,
if ((err = av_frame_copy_props(out, ref)) < 0)
return err;
- out->width = outlink->w;
- out->height = outlink->h;
- out->sample_aspect_ratio = outlink->sample_aspect_ratio;
- out->colorspace = outlink->colorspace;
- out->color_range = outlink->color_range;
- out->alpha_mode = outlink->alpha_mode;
- if (outlink->chroma_location != AVCHROMA_LOC_UNSPECIFIED)
- out->chroma_location = outlink->chroma_location;
if (s->apply_dovi && av_frame_get_side_data(ref, AV_FRAME_DATA_DOVI_METADATA)) {
/* Output of dovi reshaping is always BT.2020+PQ, so infer the correct
@@ -1012,6 +1004,14 @@ static int set_output_props(LibplaceboContext *s, const AVFilterLink *outlink,
changed |= AV_SIDE_DATA_PROP_COLOR_DEPENDENT;
}
+ out->width = outlink->w;
+ out->height = outlink->h;
+ out->sample_aspect_ratio = outlink->sample_aspect_ratio;
+ out->colorspace = outlink->colorspace;
+ out->color_range = outlink->color_range;
+ out->alpha_mode = outlink->alpha_mode;
+ if (outlink->chroma_location != AVCHROMA_LOC_UNSPECIFIED)
+ out->chroma_location = outlink->chroma_location;
if (s->color_trc >= 0)
out->color_trc = s->color_trc;
if (s->color_primaries >= 0)