This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 315446da2f0e55bd0f6d49a58e8fe76cf8b72a5c Author: Marton Balint <[email protected]> AuthorDate: Sat Nov 29 00:10:50 2025 +0100 Commit: Marton Balint <[email protected]> CommitDate: Sun Dec 7 19:36:49 2025 +0000 avfilter/af_amerge: fix indentation Signed-off-by: Marton Balint <[email protected]> --- libavfilter/af_amerge.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index e300cf9c7b..13decdadc5 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -135,21 +135,21 @@ static int query_formats(AVFilterContext *ctx) } switch (s->layout_mode) { case LM_LEGACY: - av_channel_layout_uninit(&outlayout); - if (av_popcount64(outmask) != nb_ch) { - av_log(ctx, AV_LOG_WARNING, - "Input channel layouts overlap: " - "output layout will be determined by the number of distinct input channels\n"); - av_channel_layout_default(&outlayout, nb_ch); - if (!KNOWN(&outlayout) && nb_ch) - av_channel_layout_from_mask(&outlayout, 0xFFFFFFFFFFFFFFFFULL >> (64 - nb_ch)); - } else { - for (int c = 0, ch_idx = 0; c < 64; c++) - if ((1ULL << c) & outmask) - s->route[native_layout_routes[c]] = ch_idx++; - av_channel_layout_from_mask(&outlayout, outmask); - } - break; + av_channel_layout_uninit(&outlayout); + if (av_popcount64(outmask) != nb_ch) { + av_log(ctx, AV_LOG_WARNING, + "Input channel layouts overlap: " + "output layout will be determined by the number of distinct input channels\n"); + av_channel_layout_default(&outlayout, nb_ch); + if (!KNOWN(&outlayout) && nb_ch) + av_channel_layout_from_mask(&outlayout, 0xFFFFFFFFFFFFFFFFULL >> (64 - nb_ch)); + } else { + for (int c = 0, ch_idx = 0; c < 64; c++) + if ((1ULL << c) & outmask) + s->route[native_layout_routes[c]] = ch_idx++; + av_channel_layout_from_mask(&outlayout, outmask); + } + break; case LM_RESET: av_channel_layout_uninit(&outlayout); outlayout.order = AV_CHANNEL_ORDER_UNSPEC; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
