RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swresample/swresample_frame: fix regression in detecting changes 

Do not overwrite return variable values, instead use different
one for checking results.
This commit is contained in:
Paul B Mahol 2023-01-04 17:53:01 +01:00
parent a0b5aaceca
commit 99bd2dbc91
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libswresample/swresample_frame.c
View File

@ -84,7 +84,7 @@ static int config_changed(SwrContext *s,
const AVFrame *out, const AVFrame *in) const AVFrame *out, const AVFrame *in)
{ {
AVChannelLayout ch_layout = { 0 }; AVChannelLayout ch_layout = { 0 };
int ret = 0; int ret = 0, err;
if (in) { if (in) {
#if FF_API_OLD_CHANNEL_LAYOUT #if FF_API_OLD_CHANNEL_LAYOUT
@ -96,8 +96,8 @@ FF_DISABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
} else } else
#endif #endif
if ((ret = av_channel_layout_copy(&ch_layout, &in->ch_layout)) < 0) if ((err = av_channel_layout_copy(&ch_layout, &in->ch_layout)) < 0)
return ret; return err;
if (av_channel_layout_compare(&s->in_ch_layout, &ch_layout) || if (av_channel_layout_compare(&s->in_ch_layout, &ch_layout) ||
s->in_sample_rate != in->sample_rate || s->in_sample_rate != in->sample_rate ||
s->in_sample_fmt != in->format) { s->in_sample_fmt != in->format) {
@ -116,8 +116,8 @@ FF_DISABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
} else } else
#endif #endif
if ((ret = av_channel_layout_copy(&ch_layout, &out->ch_layout)) < 0) if ((err = av_channel_layout_copy(&ch_layout, &out->ch_layout)) < 0)
return ret; return err;
if (av_channel_layout_compare(&s->out_ch_layout, &ch_layout) || if (av_channel_layout_compare(&s->out_ch_layout, &ch_layout) ||
s->out_sample_rate != out->sample_rate || s->out_sample_rate != out->sample_rate ||
s->out_sample_fmt != out->format) { s->out_sample_fmt != out->format) {