diff options
| author | James Almer <jamrial@gmail.com> | 2024-03-22 13:00:46 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-25 09:38:15 -0300 |
| commit | 65a04cae6ff89e8543e83e83533760b9c1b57b68 (patch) | |
| tree | 78c01e2e0d0a8719d78e30122d8cf019e23afcf4 | |
| parent | 1f1b773859a6f1491b1fa9f310a97ee038755263 (diff) | |
| download | ffmpeg-65a04cae6ff89e8543e83e83533760b9c1b57b68.tar.gz | |
avutil/channel_layout: don't clear the opaque pointer on type conversion
Otherwise it would not be lossless.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavutil/channel_layout.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index a83618bcc7..3054ee08a5 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -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; } } |