From 99bd2dbc9101549b4c6afb3e8d50c6a9e9e80215 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Wed, 4 Jan 2023 17:53:01 +0100
Subject: [PATCH] swresample/swresample_frame: fix regression in detecting
 changes

Do not overwrite return variable values, instead use different
one for checking results.
---
 libswresample/swresample_frame.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libswresample/swresample_frame.c b/libswresample/swresample_frame.c
index 53ac487136..8726ee58e9 100644
--- a/libswresample/swresample_frame.c
+++ b/libswresample/swresample_frame.c
@@ -84,7 +84,7 @@ static int config_changed(SwrContext *s,
                           const AVFrame *out, const AVFrame *in)
 {
     AVChannelLayout ch_layout = { 0 };
-    int ret = 0;
+    int ret = 0, err;
 
     if (in) {
 #if FF_API_OLD_CHANNEL_LAYOUT
@@ -96,8 +96,8 @@ FF_DISABLE_DEPRECATION_WARNINGS
 FF_ENABLE_DEPRECATION_WARNINGS
         } else
 #endif
-        if ((ret = av_channel_layout_copy(&ch_layout, &in->ch_layout)) < 0)
-            return ret;
+        if ((err = av_channel_layout_copy(&ch_layout, &in->ch_layout)) < 0)
+            return err;
         if (av_channel_layout_compare(&s->in_ch_layout, &ch_layout) ||
             s->in_sample_rate != in->sample_rate ||
             s->in_sample_fmt  != in->format) {
@@ -116,8 +116,8 @@ FF_DISABLE_DEPRECATION_WARNINGS
 FF_ENABLE_DEPRECATION_WARNINGS
         } else
 #endif
-        if ((ret = av_channel_layout_copy(&ch_layout, &out->ch_layout)) < 0)
-            return ret;
+        if ((err = av_channel_layout_copy(&ch_layout, &out->ch_layout)) < 0)
+            return err;
         if (av_channel_layout_compare(&s->out_ch_layout, &ch_layout) ||
             s->out_sample_rate != out->sample_rate ||
             s->out_sample_fmt  != out->format) {