aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2023-11-24 19:34:00 +0100
committerPaul B Mahol <onemda@gmail.com>2023-11-25 13:05:31 +0100
commit37c5bcc4e8fc65e64c38be6ec1ab2533c5789e12 (patch)
tree0d867f11a1d00e20ad987dc8c64d51c063a31e3d
parentbbdedd966312f72cb8d4ed6292ef233de0b23952 (diff)
downloadffmpeg-37c5bcc4e8fc65e64c38be6ec1ab2533c5789e12.tar.gz
avfilter/af_channelmap: do not override set channel layout
-rw-r--r--libavfilter/af_channelmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index 4b71dc1065..69718f5b4a 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -230,7 +230,7 @@ static av_cold int channelmap_init(AVFilterContext *ctx)
s->nch = map_entries;
if (out_ch_mask)
av_channel_layout_from_mask(&s->output_layout, out_ch_mask);
- else if (map_entries)
+ else if (map_entries && s->output_layout.nb_channels == 0)
av_channel_layout_default(&s->output_layout, map_entries);
if (mode == MAP_NONE) {