ffmpeg | branch: master | Marvin Scholz <epira...@gmail.com> | Wed Sep 11 21:07:29 2024 +0200| [c59a073abe9e13fc22035048e3f7c47527503222] | committer: Marvin Scholz
lavfi/af_channelmap: fix channelmap_init error handling The channelmap_init function was returning success even on error after 7dc81d33c241b9e176ea85956e8317f29bc9e3c0 due to shadowing of the outer ret variable. Fixes CID1619297 Logically dead code > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c59a073abe9e13fc22035048e3f7c47527503222 --- 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 f5209a10cd..7a99ac7780 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -316,7 +316,7 @@ static av_cold int channelmap_init(AVFilterContext *ctx) presence_map = av_calloc(s->nch, sizeof(*presence_map)); for (i = 0; i < s->nch; i++) { const int out_idx = s->map[i].out_channel_idx; - int ret = check_idx_and_id(ctx, out_idx, s->map[i].out_channel, &s->output_layout, "out"); + ret = check_idx_and_id(ctx, out_idx, s->map[i].out_channel, &s->output_layout, "out"); if (ret < 0) break; if (presence_map[out_idx]) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
