[FFmpeg-cvslog] swresample/swresample: fill the correct buffer to print the output layout string

James Almer git at videolan.org
Sun Aug 21 23:52:42 EEST 2022


ffmpeg | branch: release/5.1 | James Almer <jamrial at gmail.com> | Sun Aug 21 17:46:36 2022 -0300| [6ee1996721710a6b15d5664446964d7b835ff3a6] | committer: James Almer

swresample/swresample: fill the correct buffer to print the output layout string

Signed-off-by: James Almer <jamrial at gmail.com>

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

 libswresample/swresample.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 9b77ef65bf..601e691596 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -385,8 +385,8 @@ av_cold int swr_init(struct SwrContext *s){
         goto fail;
     }
 
+    av_channel_layout_describe(&s->out_ch_layout, l2, sizeof(l2));
 #if FF_API_OLD_CHANNEL_LAYOUT
-    av_channel_layout_describe(&s->out_ch_layout, l1, sizeof(l1));
     if (s->out_ch_layout.order != AV_CHANNEL_ORDER_UNSPEC && s->out.ch_count != s->out_ch_layout.nb_channels) {
         av_log(s, AV_LOG_ERROR, "Output channel layout %s mismatches specified channel count %d\n", l2, s->out.ch_count);
         ret = AVERROR(EINVAL);



More information about the ffmpeg-cvslog mailing list