Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil/channel_layout: don't clear the opaque pointer on type conversion

Browse Source 
Otherwise it would not be lossless.

Signed-off-by: James Almer <jamrial@gmail.com>
release/7.0
James Almer 8 months ago
parent 1f1b773859
commit 65a04cae6f
1 changed files with 8 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      libavutil/channel_layout.c

8
libavutil/channel_layout.c
Unescape View File

@ -902,9 +902,11 @@ int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrde
lossy = 1;
}
if (!lossy || allow_lossy) {
void *opaque = channel_layout->opaque;
av_channel_layout_uninit(channel_layout);
channel_layout->order = AV_CHANNEL_ORDER_UNSPEC;
channel_layout->nb_channels = nb_channels;
channel_layout->opaque = opaque;
return lossy;
}
return AVERROR(ENOSYS);
@ -916,8 +918,10 @@ int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrde
return AVERROR(ENOSYS);
lossy = has_channel_names(channel_layout);
if (!lossy || allow_lossy) {
void *opaque = channel_layout->opaque;
av_channel_layout_uninit(channel_layout);
av_channel_layout_from_mask(channel_layout, mask);
channel_layout->opaque = opaque;
return lossy;
}
}
@ -925,6 +929,7 @@ int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrde
case AV_CHANNEL_ORDER_CUSTOM: {
AVChannelLayout custom = { 0 };
int ret = av_channel_layout_custom_init(&custom, channel_layout->nb_channels);
void *opaque = channel_layout->opaque;
if (ret < 0)
return ret;
if (channel_layout->order != AV_CHANNEL_ORDER_UNSPEC)
@ -932,6 +937,7 @@ int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrde
custom.u.map[i].id = av_channel_layout_channel_from_index(channel_layout, i);
av_channel_layout_uninit(channel_layout);
*channel_layout = custom;
channel_layout->opaque = opaque;
return 0;
}
case AV_CHANNEL_ORDER_AMBISONIC:
@ -946,10 +952,12 @@ int av_channel_layout_retype(AVChannelLayout *channel_layout, enum AVChannelOrde
return AVERROR(ENOSYS);
lossy = has_channel_names(channel_layout);
if (!lossy || allow_lossy) {
void *opaque = channel_layout->opaque;
av_channel_layout_uninit(channel_layout);
channel_layout->order = AV_CHANNEL_ORDER_AMBISONIC;
channel_layout->nb_channels = nb_channels;
channel_layout->u.mask = mask;
channel_layout->opaque = opaque;
return lossy;
}
}

Write Preview
Loading…
Cancel
Save