github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 12:50:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

avutil/channel_layout: Fix shadowing

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2026-02-21 13:49:07 +01:00
parent 3fbe80d17e
commit 999c04db35
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavutil/channel_layout.c
View File

@@ -271,7 +271,7 @@ static int parse_channel_list(AVChannelLayout *ch_layout, const char *str)
while (*str) {
char *channel, *chname;
int ret = av_opt_get_key_value(&str, "@", "+", AV_OPT_FLAG_IMPLICIT_KEY, &channel, &chname);
ret = av_opt_get_key_value(&str, "@", "+", AV_OPT_FLAG_IMPLICIT_KEY, &channel, &chname);
if (ret < 0) {
av_freep(&map);
return ret;
@@ -345,7 +345,7 @@ int av_channel_layout_from_string(AVChannelLayout *channel_layout,
channel_layout->nb_channels = (order + 1) * (order + 1);
if (*endptr) {
int ret = av_channel_layout_from_string(&extra, endptr + 1);
ret = av_channel_layout_from_string(&extra, endptr + 1);
if (ret < 0)
return ret;
if (extra.nb_channels >= INT_MAX - channel_layout->nb_channels) {
@@ -953,10 +953,10 @@ int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrde
if (channel_layout->order == AV_CHANNEL_ORDER_CUSTOM) {
int64_t mask;
int nb_channels = channel_layout->nb_channels;
int order = av_channel_layout_ambisonic_order(channel_layout);
if (order < 0)
int amb_order = av_channel_layout_ambisonic_order(channel_layout);
if (amb_order < 0)
return AVERROR(ENOSYS);
mask = masked_description(channel_layout, (order + 1) * (order + 1));
mask = masked_description(channel_layout, (amb_order + 1) * (amb_order + 1));
if (mask < 0)
return AVERROR(ENOSYS);
lossy = has_channel_names(channel_layout);