Unified · Split
| @@ -230,7 +230,7 @@ static av_cold int channelmap_init(AVFilterContext *ctx) · 229 unmodified lines | ||
| 230 | 230 | s->nch = map_entries; |
| 231 | 231 | if (out_ch_mask) |
| 232 | 232 | av_channel_layout_from_mask(&s->output_layout, out_ch_mask); |
| 233 | − else if (map_entries) | |
| 233 | + else if (map_entries && s->output_layout.nb_channels == 0) | |
| 234 | 234 | av_channel_layout_default(&s->output_layout, map_entries); |
| 235 | 235 | |
| 236 | 236 | if (mode == MAP_NONE) { |