ffmpeg | branch: master | Paul B Mahol <[email protected]> | Fri Nov 24 19:34:00 2023 +0100| [37c5bcc4e8fc65e64c38be6ec1ab2533c5789e12] | committer: Paul B Mahol
avfilter/af_channelmap: do not override set channel layout > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37c5bcc4e8fc65e64c38be6ec1ab2533c5789e12 --- libavfilter/af_channelmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
