[FFmpeg-cvslog] avfilter/buffersrc: never override channel count in av_buffersrc_add_frame_flags

[Marton Balint]

ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun Mar 31 20:28:13 2024 +0200| [4721b9f15fc8487d718cce918f51db5b7734a942] | committer: Marton Balint

avfilter/buffersrc: never override channel count in av_buffersrc_add_frame_flags

Overriding unknown layouts with the negotiated layout is OK, but the number of
channels should match with what was negotiated.

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4721b9f15fc8487d718cce918f51db5b7734a942
---

 libavfilter/buffersrc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index bfe459c8aa..a61960310b 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -215,7 +215,7 @@ int attribute_align_arg av_buffersrc_add_frame_flags(AVFilterContext *ctx, AVFra
             break;
         case AVMEDIA_TYPE_AUDIO:
             /* For layouts unknown on input but known on link after negotiation. */
-            if (frame->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) {
+            if (frame->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC && frame->ch_layout.nb_channels == s->ch_layout.nb_channels) {
                 ret = av_channel_layout_copy(&frame->ch_layout, &s->ch_layout);
                 if (ret < 0)
                     return ret;