eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-22 15:00:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/af_amerge: fix indentation

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2025-11-29 00:10:50 +01:00
parent 3d667b147a
commit 315446da2f
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libavfilter/af_amerge.c
View File

@@ -135,21 +135,21 @@ static int query_formats(AVFilterContext *ctx)
} }
switch (s->layout_mode) { switch (s->layout_mode) {
case LM_LEGACY: case LM_LEGACY:
av_channel_layout_uninit(&outlayout); av_channel_layout_uninit(&outlayout);
if (av_popcount64(outmask) != nb_ch) { if (av_popcount64(outmask) != nb_ch) {
av_log(ctx, AV_LOG_WARNING, av_log(ctx, AV_LOG_WARNING,
"Input channel layouts overlap: " "Input channel layouts overlap: "
"output layout will be determined by the number of distinct input channels\n"); "output layout will be determined by the number of distinct input channels\n");
av_channel_layout_default(&outlayout, nb_ch); av_channel_layout_default(&outlayout, nb_ch);
if (!KNOWN(&outlayout) && nb_ch) if (!KNOWN(&outlayout) && nb_ch)
av_channel_layout_from_mask(&outlayout, 0xFFFFFFFFFFFFFFFFULL >> (64 - nb_ch)); av_channel_layout_from_mask(&outlayout, 0xFFFFFFFFFFFFFFFFULL >> (64 - nb_ch));
} else { } else {
for (int c = 0, ch_idx = 0; c < 64; c++) for (int c = 0, ch_idx = 0; c < 64; c++)
if ((1ULL << c) & outmask) if ((1ULL << c) & outmask)
s->route[native_layout_routes[c]] = ch_idx++; s->route[native_layout_routes[c]] = ch_idx++;
av_channel_layout_from_mask(&outlayout, outmask); av_channel_layout_from_mask(&outlayout, outmask);
} }
break; break;
case LM_RESET: case LM_RESET:
av_channel_layout_uninit(&outlayout); av_channel_layout_uninit(&outlayout);
outlayout.order = AV_CHANNEL_ORDER_UNSPEC; outlayout.order = AV_CHANNEL_ORDER_UNSPEC;